Commit Graph

6199 Commits

Author SHA1 Message Date
Alexander A. Klimov 7353c0d287 IdoQuery::initializeForPostgres(): cast only valid IP addresses to inet
fixes #7165
2015-05-12 16:35:14 +02:00
Alexander A. Klimov 4bda1cf6d6 Merge branch 'bugfix/Centralize-submission-and-apply-handling-of-sort-rules-9220'
fixes #9220
2015-05-12 10:32:24 +02:00
Alexander A. Klimov afa0dc0956 SortBox::handleRequest(): check whether $this->query !== null
refs #9220
2015-05-12 10:29:50 +02:00
Alexander A. Klimov dd58f1466c Don't apply sort rules in Monitoring_ListController::filterQuery()
refs #9220
2015-05-12 10:17:38 +02:00
Alexander A. Klimov e1c3d23d12 Icinga\Web\Controller::setupSortControl(): set query on the newly created SortBox (if given)
refs #9220
2015-05-11 16:28:23 +02:00
Alexander A. Klimov 32659647b9 Implement Icinga\Web\Widget\SortBox::handleRequest()
refs #9220
2015-05-11 16:09:20 +02:00
Alexander A. Klimov 17ebe07e57 Implement Icinga\Web\Widget\SortBox::setQuery()
refs #9220
2015-05-11 15:37:00 +02:00
Matthias Jentsch 6658415b6f Remove uneeded use statements 2015-05-11 14:40:23 +02:00
Alexander A. Klimov 295254d1d5 Rename Icinga\Web\Widget\SortBox::applyRequest() to ...::setRequest()
refs #9220
2015-05-11 14:07:57 +02:00
Alexander A. Klimov 152c6a8f7f Merge Monitoring_ListController::hasBetterUrl() into Icinga\Web\Controller::init()
refs #9220
2015-05-11 13:36:58 +02:00
Matthias Jentsch 25f397042b Merge branch 'master' into feature/improve-multi-select-view-8565
Conflicts:
	modules/monitoring/application/controllers/HostsController.php
	modules/monitoring/application/controllers/ServicesController.php
	modules/monitoring/application/views/scripts/hosts/show.phtml
	modules/monitoring/application/views/scripts/list/hosts.phtml
	modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
	modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
	modules/monitoring/application/views/scripts/services/show.phtml
	modules/monitoring/public/css/module.less
	public/js/icinga/behavior/tooltip.js
2015-05-11 13:28:43 +02:00
Alexander Fuhr c3b4ea71d3 Add ido schema and instance availability validation
refs #9203
2015-05-11 10:32:34 +02:00
Matthias Jentsch cf8376f478 Merge branch 'bugfix/delete-multiple-downtimes-and-comments-8624'
fixes #8624
2015-05-07 17:36:49 +02:00
Matthias Jentsch 8c5f2662ea Fix redirects in downtime multi view
refs #8624
2015-05-07 17:33:38 +02:00
Matthias Jentsch fff2d5c816 Use consistent controller names
refs #8624
2015-05-07 17:29:46 +02:00
Matthias Jentsch 83efc3a4a3 Conform to coding guidelines 2015-05-07 17:23:50 +02:00
Alexander Fuhr 891ce0fe57 UserTest: Fix wrong assert condition for wildcard 2015-05-07 17:19:00 +02:00
Markus Frosch 9936df5157 Fix current base version to v2.0.0-beta3
We can't really fix tag and release tarballs though.

This is mainly for Jenkins...
2015-05-07 17:08:01 +02:00
Matthias Jentsch c6c78989a5 Fix redirects after deleting a comment
refs #8624
2015-05-07 17:02:34 +02:00
Matthias Jentsch 1fa550838d Coding guidelines and cleanup 2015-05-07 16:37:35 +02:00
Matthias Jentsch 7cf2cb034e Remove unused and redundant controller actions
refs #8624
2015-05-07 16:22:17 +02:00
Matthias Jentsch ac599e642a Add submit button label to multi comment form
refs #8624
2015-05-07 16:21:34 +02:00
Matthias Jentsch b314c074cc Fix downtime and comment form redirects
refs #8624
2015-05-07 16:20:59 +02:00
Matthias Jentsch 4463f16f04 Add abbillity to remove multiple comments by id
refs #8624
2015-05-07 15:11:54 +02:00
Matthias Jentsch ffd12e325c Improve up downtime command form properties
Use a flag instead of a enumeration in delete downtime command form, to remove needless boilerplate.

refs #8624
2015-05-07 14:05:16 +02:00
Matthias Jentsch b35dd4ddfe Separate forms for deleting single and multiple comments
refs #8624
2015-05-07 14:03:09 +02:00
Matthias Jentsch f2d89aee74 Merge branch 'feature/comment-detail-view-8903'
resolves #8903
2015-05-07 10:59:49 +02:00
Matthias Jentsch 7c8ff44fd1 Fix comment and downtime list inline forms
refs #8903
refs #8902
2015-05-07 10:59:37 +02:00
Matthias Jentsch 11c9cde557 Remove dashboard action from multi view
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch 3187975553 Conform to coding guidelines 2015-05-07 10:59:36 +02:00
Matthias Jentsch 1586275521 Conform to coding guidelines in downtime controller 2015-05-07 10:59:36 +02:00
Matthias Jentsch e5e3e80300 Conform to coding guidelines 2015-05-07 10:59:36 +02:00
Matthias Jentsch 5477a2f18e Escape missing variables
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch e6740c5093 Set link target to next page in all comment views
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch c71786a624 Remove useless comments 2015-05-07 10:59:36 +02:00
Matthias Jentsch 6ff903c8a9 Remove useless comments 2015-05-07 10:59:36 +02:00
Matthias Jentsch 0c7d8ab481 Add controlle for handling multiple comments
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch ca839d5123 Display amount of selected rows
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch cab198eadc Fix whitespaces and unused comments 2015-05-07 10:59:36 +02:00
Matthias Jentsch 32da02c162 Deduplicate comment views
Move comment detail and description into separate partial to reduce code duplication
2015-05-07 10:59:36 +02:00
Matthias Jentsch dedc175967 Add basic comment detail view
refs #8903
2015-05-07 10:59:36 +02:00
Matthias Jentsch 2ade247dbb Merge branch 'feature/downtime-detail-view-8902'
resolves #8902
2015-05-07 10:50:40 +02:00
Matthias Jentsch d316b31cbb Fix downtime removal command in detail view
Use removal command for single downtimes in detail view. Move removing single and multiple downtimees into seperate forms.

refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch a46dece136 Provie link to detail view in downtime partial
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch be566746a9 Provide downtime header in remove and remove-all commands
Add new show script for downtimes and move downtime headers into partials to deduplicate code.

refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 6ddb004230 Move removal command actions into the downtime controllers
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch b186ce2cac Handle non-existed downtime ids with exceptions
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 400f351ea5 Improve detail view layout
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch 07c5e67304 Display additional downtime info in multiselection detail view
refs #8902
2015-05-07 10:34:06 +02:00
Matthias Jentsch a87e1f91d9 Implement detail view for multiple downtimes
refs #8902
2015-05-07 10:34:06 +02:00