Commit Graph

8558 Commits

Author SHA1 Message Date
Eric Lippmann f6d3465ad2 Merge branch 'feature/ldap-server-side-sorting-9364'
resolves #9364
2015-09-04 12:00:31 +02:00
Eric Lippmann 297a4333cd lib/ldap: Use the indefinite form of the length octets for encoded sort rules where appropriate
I guess we may never need this, but hey :)

refs #9364
2015-09-04 11:58:11 +02:00
Johannes Meyer 294f9022f2 Use the new navigation to render the menu
refs #5600
2015-09-04 10:53:01 +02:00
Johannes Meyer 5ff3db8a3c Url: Explicitly handle '#'
Feels like a quick&dirty solution. Feel free to improve it.

refs #5600
2015-09-04 10:34:39 +02:00
Johannes Meyer 07588595f2 NavigationItem: Automatically determine whether it's active or not
refs #5600
2015-09-04 10:10:33 +02:00
Eric Lippmann 9b22b24561 lib/ldap: Use ldap_count_entries for counting the result set 2015-09-04 09:57:04 +02:00
Johannes Meyer baefc89f85 NavigationRenderer: Provide a id for outer item markup (<li>)
refs #5600
2015-09-04 09:41:39 +02:00
Johannes Meyer 2855778dc7 Revert "NavigationItemRenderer: Provide a id if none is set"
This reverts commit c60839d798.
2015-09-04 09:38:03 +02:00
Johannes Meyer 975cc92f6b NavigationItem: Provide "#" as default url for items with children
refs #5600
2015-09-04 09:31:23 +02:00
Johannes Meyer 4e948b46bf NavigationRenderer: Add id "navigation" to the navigation's heading
refs #5600
2015-09-04 09:26:28 +02:00
Johannes Meyer c60839d798 NavigationItemRenderer: Provide a id if none is set
refs #5600
2015-09-04 09:25:58 +02:00
Johannes Meyer a8d5a78aa2 NavigationItem: Fix method getUniqueName()
refs #5600
2015-09-04 09:25:25 +02:00
Johannes Meyer a6b2c23684 Update navigation rendering code to fit the previous adjustments
refs #5600
2015-09-04 09:08:20 +02:00
Eric Lippmann fa25ce7f2f lib/ldap: Set server side sorting after calling ldap_control_paged_result()
ldap_control_paged_result() seems to override already set server controls.

refs #9364
2015-09-03 17:50:24 +02:00
Eric Lippmann 9e11d539fd lib/ldap: Enable server side sorting if supported by the server
refs #9364
2015-09-03 17:48:53 +02:00
Eric Lippmann 00e5bbe91c lib/ldap: Fix LdapConnection::encodeSortRules()
refs #9364
2015-09-03 17:47:54 +02:00
Eric Lippmann 70a6157631 lib/ldap: Call getConnection before bind
Looks more natural
2015-09-03 17:11:56 +02:00
Eric Lippmann 5651392ce7 monitoring/config: Rename URL paramter backend to backend-name
Else the parameter conflicts w/ the module-wide paramter backend for choosing the data source.
2015-09-03 17:03:33 +02:00
Eric Lippmann c19e850df3 Fix erroneous CSS statements 2015-09-03 16:58:36 +02:00
Eric Lippmann 2da49ad697 monitoring/detail: Display the comment of the ack next to the ack
refs #9674
2015-09-03 16:39:56 +02:00
Eric Lippmann f0e8340fbd monitoring/detail: Don't display the comment of the active acknowledgement in the comment list
refs #9674
2015-09-03 16:38:46 +02:00
Eric Lippmann 8a1592fd12 monitoring/lib: Add Acknowledgement object
refs #9674
2015-09-03 16:27:50 +02:00
Eric Lippmann a14b1ce8f7 monitoring/service: Fetch acknowledgement type
refs #9674
2015-09-03 16:23:27 +02:00
Eric Lippmann df72825617 monitoring/host: Fetch acknowledgement type
refs #9674
2015-09-03 16:23:04 +02:00
Eric Lippmann 620c1fa6e0 monitoring: Fix alphabetical order of query columns in the CommentQuery 2015-09-03 16:21:01 +02:00
Eric Lippmann cf917b59f8 lib: Fix PHPDoc of DbConnection::getDbApdater() 2015-09-03 16:20:29 +02:00
Matthias Jentsch ddde37e225 Remove acknowledgement view temporarily
Implementation of acknowledgement view temporarily delayed until v2.1.0.

refs #10032
2015-09-03 16:08:55 +02:00
Johannes Meyer 9e558c9861 Add class SummaryNavigationItemRenderer
refs #5600
2015-09-03 15:53:42 +02:00
Johannes Meyer ad6a2938ab Add class BadgeNavigationItemRenderer
refs #5600
2015-09-03 15:53:23 +02:00
Johannes Meyer b53fb04a0f Move navigation related renderer classes to the new namespace
refs #5600
2015-09-03 15:52:37 +02:00
Johannes Meyer 7adfc58878 NavigationItem: Add missing return keyword in method render()
refs #5600
2015-09-03 15:04:39 +02:00
Johannes Meyer a930ea7f7a Navigation: Add method render()
refs #5600
2015-09-03 15:04:07 +02:00
Johannes Meyer 9a725330fb NavigationItem: Provide the item to the renderer before calling render
refs #5600
2015-09-03 14:22:38 +02:00
Eric Lippmann 6a684a97df monitoring: Fix missing parameter initialization in MonitoredObject::parseAttributeUrls() 2015-09-03 14:09:16 +02:00
Eric Lippmann 54a45ff338 monitoring: Fix PHPDoc of MonitoredObject::resolveAllStrings() 2015-09-03 14:08:43 +02:00
Eric Lippmann dc5e86002b monitoring: Reorder code in MonitoredObject 2015-09-03 14:07:38 +02:00
Eric Lippmann 4d2675659c monitoring: Optimize imports in MonitoredObject 2015-09-03 13:47:51 +02:00
Johannes Meyer 16ece09b0a NavigationItemRenderer: Add option $target
refs #5600
2015-09-03 13:36:34 +02:00
Johannes Meyer 67dee62c57 NavigationItemRenderer: Add support for options
refs #5600
2015-09-03 13:36:13 +02:00
Johannes Meyer c3ad665c15 Navigation: Fix accessing a non-existent and static variable
refs #5600
2015-09-03 12:52:07 +02:00
Johannes Meyer c35db55857 Navigation: Add missing new keyword
refs #5600
2015-09-03 11:26:27 +02:00
Johannes Meyer 2834e206d5 NavigationItem: Add support for custom renderers
refs #5600
2015-09-03 11:25:51 +02:00
Eric Lippmann e5c9eb1d20 monitoring: Don't show ack comments in the comments area of a host or service
refs #9674
2015-09-03 10:52:05 +02:00
Eric Lippmann 96f8afa6f1 monitoring/menu: Move Notifications beneath History
resolves #8884
2015-09-03 10:41:47 +02:00
Johannes Meyer 811269df01 NavigationItem: Rename method getView() to view()
refs #5600
2015-09-03 10:39:11 +02:00
Johannes Meyer 206168672b NavigationItem: Add method getUniqueName()
refs #5600
2015-09-03 10:22:47 +02:00
Johannes Meyer e6a6ae996a Navigation: Merge other navigations more sophisticated
refs #5600
2015-09-03 09:57:52 +02:00
Johannes Meyer 537db6000e NavigationItem: Add method merge()
refs #5600
2015-09-03 09:56:22 +02:00
Johannes Meyer a626e8f7fb NavigationItem: Allow to set and get single url parameters
refs #5600
2015-09-03 09:56:02 +02:00
Johannes Meyer 1fb5c96ef1 Navigation: Add method order()
refs #5600
2015-09-03 08:52:02 +02:00