Commit Graph

8662 Commits

Author SHA1 Message Date
Eric Lippmann b5561a8306 monitoring: Rearrange code in the HostcommentQuery
refs #9956
2015-09-29 22:23:16 +02:00
Eric Lippmann 2ce63ad67d monitoring: Remove HostcommentQuery::getGroup()
refs #9956
2015-09-29 22:22:32 +02:00
Eric Lippmann c597a671f3 monitoring: Rearrange code in the ContactgroupQuery
refs #9956
2015-09-29 22:22:09 +02:00
Eric Lippmann a9588c9cc2 monitoring: Remove ContactgroupQuery::getGroup()
refs #9956
2015-09-29 22:21:05 +02:00
Eric Lippmann 02215592be monitoring: Rearrange code in the ContactQuery
refs #9956
2015-09-29 22:20:39 +02:00
Eric Lippmann e110649184 monitoring: Remove ContactQuery::getGroup()
refs #9956
2015-09-29 22:16:35 +02:00
Eric Lippmann 1de527c5f8 monitoring: Implement IdoQuery::getGroup()
refs #9956
2015-09-29 22:16:12 +02:00
Eric Lippmann 0a8369e6e5 monitoring/lib: Add iterator for iterating over non-pseudo monitoring query columns
refs #9956
2015-09-29 22:15:11 +02:00
Eric Lippmann 5008537683 lib: Fix PHPDoc of SimpleQuery::getOrder() 2015-09-27 12:57:47 +02:00
Eric Lippmann 747c6f9b0b monitoring: Move instance_name from query to filter columns in the comment data view
We don't select but filter for this column.
2015-09-27 12:57:35 +02:00
Eric Lippmann 463fa45f20 monitoring: Move instance_name from query to filter columns in the downtime data view
We don't select but filter for this column
2015-09-27 12:57:35 +02:00
Eric Lippmann 30904056f1 monitoring: Make instance_name filterable for service downtimes 2015-09-27 12:57:35 +02:00
Eric Lippmann 5ca1e76524 monitoring: Make instance_name filterable for service comments 2015-09-27 12:57:34 +02:00
Eric Lippmann 395d285b9d monitoring: Make instance_name filterable for host downtimes 2015-09-27 12:57:34 +02:00
Eric Lippmann e46fbe37af monitoring: Make instance_name filterable for host comments 2015-09-27 12:57:34 +02:00
Eric Lippmann 7ed7343587 monitoring: Reorder query columns in the ContactQuery 2015-09-27 12:57:34 +02:00
Eric Lippmann faa9b41fb8 monitoring: Clear order of the HoststatusQuery used in the HostserviceproblemsummaryQuery 2015-09-27 12:57:34 +02:00
Eric Lippmann 78989c0aad lib: Add SimpleQuery::clearOrder() 2015-09-27 12:56:48 +02:00
Johannes Meyer d4c1ca9e18 Merge branch 'feature/custom-menu-items-5600'
resolves #5600
fixes #10169
fixes #10046
fixes #10082
2015-09-25 14:17:34 +02:00
Johannes Meyer a55cced039 Merge branch 'master' into feature/custom-menu-items-5600
Conflicts:
	modules/monitoring/application/views/scripts/list/comments.phtml
	modules/monitoring/application/views/scripts/list/downtimes.phtml
2015-09-25 14:12:43 +02:00
Johannes Meyer f17c185aed js: Improve logging when pushing history states 2015-09-25 14:08:10 +02:00
Johannes Meyer 67a28a4b47 js: Do not re-open the detail url if it's the origin of a redirect
refs #5600
2015-09-25 13:58:52 +02:00
Alexander A. Klimov a9ec0eebef Merge branch 'bugfix/don-t-use-parse_ini_file-in-Config-10150'
fixes #10150
2015-09-25 12:19:38 +02:00
Alexander A. Klimov 812545c04b IniStore::load(): use IniParser::parseIniFile() instead of parse_ini_file()
refs #10150
2015-09-25 12:15:47 +02:00
Alexander A. Klimov 8dc9928cb3 IniParser::parseIniFile(): return a Config instance
refs #10150
2015-09-25 12:04:13 +02:00
Alexander A. Klimov a090907373 Conform to coding guidelines 2015-09-25 11:37:06 +02:00
Johannes Meyer 086579b254 NavigationController: Rerender the layout when removing menu entries
refs #5600
2015-09-25 10:51:44 +02:00
Johannes Meyer 2952eaefcd NavigationController: Rerender the layout when unsharing menu entries
refs #5600
2015-09-25 10:51:16 +02:00
Johannes Meyer e8f93e8ea1 NavigationConfigForm: Translate non-translated error messages
refs #5600
2015-09-24 15:50:40 +02:00
Johannes Meyer 3f22469c18 NavigationConfigForm: Fix name validation when adding or editing items
refs #5600
2015-09-24 15:50:19 +02:00
Johannes Meyer cd1510d846 NavigationConfigForm: Set a "name" as default key column for nav configs
refs #5600
2015-09-24 15:49:04 +02:00
Johannes Meyer b7ef951e57 NavigationController: Rerender the layout when editing a menu entry
refs #5600
2015-09-24 14:05:57 +02:00
Johannes Meyer c4df7e05be NavigationController: Rerender the layout when adding a menu entry
refs #5600
2015-09-24 14:05:28 +02:00
Johannes Meyer 165dc00fad Url: Do not throw ProgrammingError if there is no relative url available
refs #5600
2015-09-24 14:03:15 +02:00
Johannes Meyer 338c0680e0 NavigationConfigForm: Consider a user's config and the share config as one
Actually, we need a more sophisticated solution for this, but I guess this is a
proper quickfix to avoid any conflicts when switching between shared and
non-shared.

refs #5600
2015-09-24 12:58:11 +02:00
Johannes Meyer 4d303e7121 NavigationController: Redirect to the shared overview if its the referrer..
..when editing a navigation item.

refs #5600
2015-09-23 14:21:04 +02:00
Johannes Meyer 6aecfe6959 Introduce base form class ActionForm
refs #5600
2015-09-23 13:45:33 +02:00
Johannes Meyer 40c2cb2d12 MonitoredObject: Support host- and servicegroup filters in method matches()
refs #5600
2015-09-23 13:03:41 +02:00
Johannes Meyer e42548fc80 MonitoredObject: Allow to fetch servicegroups for host objects
refs #5600
2015-09-23 13:02:43 +02:00
Johannes Meyer 9042d55dd4 FilterExpression: Add support multi value columns in method matches()
refs #5600
2015-09-23 13:02:13 +02:00
Johannes Meyer e4e560ab1a FilterMatchNot: Do not re-invent the parents implementation of matches()
refs #5600
2015-09-23 13:01:08 +02:00
Johannes Meyer 939188be94 FilterMatch: Do not re-invent the parents implementation of matches()
refs #5600
2015-09-23 13:00:46 +02:00
Johannes Meyer fcdf41a9b8 DashletForm: Provide a helpful hint how to input external urls
refs #5600
2015-09-22 16:24:09 +02:00
Johannes Meyer f47c0475c9 NavigationItemForm: Provide a helpful hint how to input external urls
refs #5600
2015-09-22 16:18:55 +02:00
Johannes Meyer 5193fce1dd Url: Fix external url detection
refs #5600
2015-09-22 16:18:27 +02:00
Johannes Meyer 81e13109fc Revert "Url: Add support macros"
This reverts commit 33231d24da.
There is no need for url macros, since we're handling absolute
urls correctly now.
2015-09-22 15:51:00 +02:00
Matthias Jentsch b69311165c Conform to coding guidelines 2015-09-22 14:53:29 +02:00
Alexander A. Klimov 626c3494e4 Config::fromIni(): use IniParser::parseIniFile() instead of parse_ini_file()
refs #10150
2015-09-22 14:50:49 +02:00
Alexander A. Klimov acb93ce1ae Implement Document::toArray()
refs #10150
2015-09-22 14:50:49 +02:00
Alexander A. Klimov 777c4d0baf Implement Section::toArray()
refs #10150
2015-09-22 14:50:49 +02:00