Commit Graph

2759 Commits

Author SHA1 Message Date
Johannes Meyer 6967fffb1f Navigation: Add support dashboard-panes and check module permissions
refs #5600
2015-09-04 15:51:51 +02:00
Johannes Meyer 95a61e89a9 Module: Fix how dashlets are loaded
refs #5600
2015-09-04 15:51:33 +02:00
Matthias Jentsch 29a2ee1a02 Merge branch 'feature/provide-counter-view-10033'
resolves #10033
2015-09-04 15:27:35 +02:00
Johannes Meyer 70a48643c1 Add class DashboardContainer
refs #5600
2015-09-04 15:25:19 +02:00
Johannes Meyer 5c2619dcb5 Add class NavigationItemContainer
refs #5600
2015-09-04 15:04:29 +02:00
Eric Lippmann 39c68dd5ce LDAP Auth: Fix Fatal error: Call to a member function hasOid() on a non-object 2015-09-04 15:01:05 +02:00
Johannes Meyer 2af06e9415 NavigationItem: Re-introduce a default priority of 100
refs #5600
2015-09-04 14:20:21 +02:00
Johannes Meyer b2a0f1b9c2 Navigation: Peform a case-insensitive search when merging items
refs #5600
2015-09-04 14:17:16 +02:00
Johannes Meyer ab23b56973 Web: Load module menus
refs #5600
2015-09-04 13:55:49 +02:00
Johannes Meyer 63f8f34c15 Navigation: Add method load()
Supports currently only module menus.

refs #5600
2015-09-04 13:55:31 +02:00
Johannes Meyer 27a6b5bb75 Module: Utilize MenuItemContainer instead of Menu
refs #5600
2015-09-04 13:54:53 +02:00
Johannes Meyer 8643fec309 Add class MenuItemContainer
resf #5600
2015-09-04 13:54:23 +02:00
Johannes Meyer 881880f18f SummaryNavigationItemRenderer: Fix method getTitle()
refs #5600
2015-09-04 13:48:29 +02:00
Johannes Meyer 8e24ec978d BadgeNavigationItemRenderer: Use view() instead of getView()
refs #5600
2015-09-04 13:47:57 +02:00
Johannes Meyer 044fe031da NavigationItemRenderer: Add method init()
refs #5600
2015-09-04 13:47:38 +02:00
Johannes Meyer 1a42c04c8e NavigationItem: Fix locating a module's custom navigation renderer
refs #5600
2015-09-04 13:47:17 +02:00
Eric Lippmann b28f1c4038 Merge branch 'bugfix/monitoring-ack-comments-display-9674'
fixes #9674
2015-09-04 13:04:39 +02:00
Matthias Jentsch ca33e71f2d Deduplicate and clean up service summary component
Remove redundant component view script and streamline subFilter handling in all views that render it. Remove
heading from component to allow embedding in different types of views.

refs #10033
2015-09-04 13:02:57 +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 cf917b59f8 lib: Fix PHPDoc of DbConnection::getDbApdater() 2015-09-03 16:20:29 +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
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
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
Johannes Meyer 00447488ee NavigationItem: Drop interface Countable
$item->count(), count of what?
$item->getChildren()->count(), Its children, of course!

refs #5600
2015-09-03 08:49:30 +02:00
Johannes Meyer f4a6ab73c0 NavigationItem: Add property priority
refs #5600
2015-09-03 08:33:13 +02:00
Johannes Meyer 1393db687b NavigationItem: Adjust some docblocks
refs #5600
2015-09-02 15:42:54 +02:00
Johannes Meyer 298c4ad38b NavigationItem: Cast a string to Url already in setUrl()
refs #5600
2015-09-02 15:35:08 +02:00
Johannes Meyer 1788cc9b6a NavigationItem: Use setView() to initiliaze $view
refs #5600
2015-09-02 15:33:45 +02:00
Johannes Meyer 6802c0a9e4 NavigationItem: Do not disable the complete parent hierarchy..
..if just a child gets deactivated.

refs #5600
2015-09-02 15:32:37 +02:00
Johannes Meyer 2bfeb335a5 NavigationItem: Add method setParent() and getParent()
refs #5600
2015-09-02 15:30:35 +02:00
Johannes Meyer e2beb7d027 NavigationItem: Return the name if no label is set in getLabel()
refs #5600
2015-09-02 15:27:34 +02:00
Johannes Meyer 1ef4a2f7d0 NavigationItem: Do not provide a default for setProperties()
refs #5600
2015-09-02 15:26:07 +02:00
Johannes Meyer 8a29660226 NavigationItem: Overwrite the property in method setAttributes()
A setter sets something instead of patching it.

refs #5600
2015-09-02 15:25:10 +02:00
Johannes Meyer 5efcb18fa0 NavigationItem: Set the parent on a child in method setChildren()
refs #5600
2015-09-02 15:21:40 +02:00
Johannes Meyer c9050e2f21 NavigationItem: Initialize $children before setting the properties
refs #5600
2015-09-02 15:20:26 +02:00
Johannes Meyer 62f7a49a45 NavigationItem: Reduce code complexity in method addChild()
refs #5600
2015-09-02 15:17:26 +02:00
Johannes Meyer c03109c4c6 NavigationItem: Catch exceptions thrown in __toString()
refs #5600
2015-09-02 15:16:05 +02:00
Johannes Meyer 95a3f1c011 Navigation: Clear the parent name from a configured navigation item
refs #5600
2015-09-02 15:14:55 +02:00
Johannes Meyer 29413360d9 Navigation: Add method merge()
refs #5600
2015-09-02 13:34:56 +02:00
Johannes Meyer a4c2081f64 Navigation: Remove method hasItems()
Redundant, as it's expressible with "! $nav->isEmpty()".

refs #5600
2015-09-02 13:29:07 +02:00
Johannes Meyer f449c78dbf NavigationItem: Make it having a name instead of a id..
..and require it as first argument on construction time.

refs #5600
2015-09-02 13:27:12 +02:00
Johannes Meyer b3159ee60d NavigationItem: Accept arrays for method setChildren()
refs #5600
2015-09-02 12:59:05 +02:00
Johannes Meyer 83974b7698 Navigation: Add method fromConfig()
refs #5600
2015-09-02 12:58:12 +02:00
Johannes Meyer 997b57834c Navigation: Add method fromArray()
refs #5600
2015-09-02 12:57:49 +02:00
Johannes Meyer 0788041c43 Navigation: Accept item configuration for method addItem()
And check an item's permission.

refs #5600
2015-09-02 12:57:14 +02:00
Russell Kubik 056ab0c96c Fix that DbUserBackend::inspect() reports 0 users when only one exists
refs #9739

Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-09-01 23:08:24 +02:00
Eric Lippmann d2a4b880b1 Revert "Accept DbUserBackends with only one single user"
This reverts commit c8d065b3e0.

There's a PR on GitHub open that was contributed earlier than this fix. Thus giving credit to the PR's author.

refs #9739
2015-09-01 23:05:34 +02:00
Emil Vikström e3ea0e5949 Use yellow for warning logs in ANSI CLI
Signed-off-by: Eric Lippmann <eric.lippmann@netways.de>
2015-09-01 22:55:42 +02:00
Johannes Meyer c154f96d44 Navigation: Add method createItem()
refs #5600
2015-09-01 16:02:44 +02:00
Eric Lippmann 52b0c8c258 lib: Add navigation classes (WIP)
- Lacks custom renderer functionality
- Lacks navigation item priorities
- Lacks permission handling

refs #5600
2015-09-01 12:48:45 +02:00
Eric Lippmann e78f833232 Merge branch 'bugfix/language-negotiation-safari-7818'
fixes #7818
2015-08-31 16:46:32 +02:00
Eric Lippmann 4a5d2784fb Normalize languages for negotiation to lowercase
refs #7818
2015-08-31 16:45:14 +02:00
Eric Lippmann 4fb6856caf Fix exception when navigating to the preferences after namespacing all controllers 2015-08-31 10:19:30 +02:00
Eric Lippmann 38ef8c7f11 lib: Fix PHPDoc of Translator::splitLocaleCode() 2015-08-31 09:08:31 +02:00
Eric Lippmann e7e1b1a98e Dispatcher: Default to the default module if no module has been given in the request
This is most likely the case when custom routes have been added to the router w/o the module parameter being set.

refs #5786
2015-08-28 13:13:20 +02:00
Eric Lippmann c0eb0cbe6a modules: Tell the dispatcher that the static controller is to be found in the default module
refs #5786
2015-08-28 13:13:07 +02:00
Eric Lippmann bcc02f50ec lib: Optimize imports in webrouter 2015-08-28 09:42:49 +02:00
Eric Lippmann 9cf56410e9 lib: Fix PHPDoc of Form::populate() 2015-08-27 15:52:13 +02:00
Eric Lippmann 4070f6c75b Merge branch 'master' into feature/namespaced-controllers-5786 2015-08-27 15:05:44 +02:00
Johannes Meyer f90f7b1528 User: Consider the shortest wildcard permission more important
I hope we do not need a fourth attempt to get this right...

fixes #10016
2015-08-27 14:24:04 +02:00
Eric Lippmann c5d0094e8e lib: Add AlreadyExistsException 2015-08-27 13:56:24 +02:00
Eric Lippmann ba09b02f5c lib: Fix PHPDoc of Version::get() 2015-08-27 13:06:49 +02:00
Eric Lippmann df66d0b0f5 lib: Add PHPDoc to Version 2015-08-27 13:06:31 +02:00
Eric Lippmann 28009eb563 Rename controller namespace to Controllers
refs #5786
2015-08-27 13:03:45 +02:00
Eric Lippmann eb30ecd776 Revert "Fix failing search dashboard test"
This reverts commit 7c0dbe0077f56aef5f2a744761b47a0715dd591a.

Fixed by using t() in the SearchDashboard already.
2015-08-27 12:58:56 +02:00
Eric Lippmann 176177d874 Fix failing search dashboard test 2015-08-27 12:58:56 +02:00
Eric Lippmann c294283636 Merge branch 'bugfix/service-grid-grouping-postgres-9333'
Conflicts:
	modules/monitoring/application/controllers/ListController.php
	modules/monitoring/library/Monitoring/Backend/Ido/Query/IdoQuery.php

fixes #9333
fixes #9538
2015-08-27 12:58:49 +02:00
Johannes Meyer 8cc1970a9f SearchDashboard: Use t() instead of the view helper
Since it's library code we do not need to use the module-aware
translation helper.
2015-08-25 16:51:50 +02:00
Eric Lippmann e27d2e998b monitoring: Fix grouping and ordering of the service when using display names
refs #9538
refs #9333
2015-08-25 16:13:34 +02:00
Eric Lippmann c8790fad93 Merge branch 'bugfix/service-grid-display_name-9538' into bugfix/service-grid-grouping-postgres-9333
Conflicts:
	library/Icinga/Data/PivotTable.php
	modules/monitoring/application/controllers/ListController.php
2015-08-25 15:51:20 +02:00
Eric Lippmann 403f7016ca lib: Allow to set axis header columns in the pivot table
PivotTable::toArray() now returns the pivot data and the pivot header.

refs #9538
2015-08-25 14:46:23 +02:00