Commit Graph

7871 Commits

Author SHA1 Message Date
Johannes Meyer c0b82eff94 Servicegroup Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 15:18:40 +02:00
Eric Lippmann 096a8cdd69 Merge branch 'bugfix/error-prone-generictts-9611'
fixes #9611
2015-08-03 15:07:25 +02:00
Johannes Meyer 39d29c79d2 Hostgroup Overview: Use $query->hasResult() instead of $query->count()
refs #9632
2015-08-03 15:06:22 +02:00
Eric Lippmann 688a08585b Merge branch 'master' into bugfix/error-prone-generictts-9611
Conflicts:
	modules/monitoring/application/views/scripts/show/components/downtime.phtml
2015-08-03 15:05:45 +02:00
Eric Lippmann d8e6418e94 monitoring: Fix code style in the show/components/downtime.phtml view script
refs #9611
2015-08-03 15:03:31 +02:00
Eric Lippmann 0809caa86b monitoring: Fix indent in the show/components/comments.phtml view script
refs #9611
2015-08-03 15:03:02 +02:00
Johannes Meyer 9a0e47a3e1 SimpleQuery: Add method hasResult()
refs #9632
2015-08-03 14:49:33 +02:00
Johannes Meyer dbc2f98053 SimpleQuery: Initialize self::$iteratorPosition as late as possible
refs #9632
2015-08-03 14:09:55 +02:00
Matthias Jentsch 6a17d7cb26 Do not target next pane in multiview detail controls
fixes #9815
2015-08-03 13:45:47 +02:00
Alexander Fuhr a63b69f4a1 components/downtime: Add downtime end time information in view
fixes #8845
2015-08-03 13:44:41 +02:00
Alexander Fuhr 8860181bcc Revert "components/downtime: Add downtime end time information in view"
This reverts commit 863330e50d.

refs #8845
2015-08-03 13:42:11 +02:00
Alexander Fuhr 1652f1e1ae Revert "components/downtime: Add the missing php script tag"
This reverts commit 95ea0e616d.

refs #8845
2015-08-03 13:41:40 +02:00
Alexander Fuhr 95ea0e616d components/downtime: Add the missing php script tag
refs #8845
2015-08-03 13:05:41 +02:00
Eric Lippmann ea5db51213 Fix "Try to get an inexistent pane." when clicking on the "Search" tab 2015-08-03 13:01:11 +02:00
Eric Lippmann 139baffdc6 lib: Make Dashboard::$tabs protected
The SearchDashboard has to override Dashboard::getTabs() in order to set up the correct tab.
2015-08-03 13:01:11 +02:00
Alexander Fuhr 863330e50d components/downtime: Add downtime end time information in view
fixes #8845
2015-08-03 12:37:09 +02:00
Eric Lippmann 177fafaa56 lib: Fix TicketHook's PHPDoc
refs #9611
2015-08-03 11:05:48 +02:00
Eric Lippmann d5e2f92aa9 monitoring: Use createTicketLinks helper when showing downtimes of an object
refs #9611
2015-08-03 11:00:46 +02:00
Eric Lippmann a379a448d9 monitoring: Fix code style in the show/components/comments.phtml view script
refs #9611
2015-08-03 10:58:57 +02:00
Eric Lippmann b6caeb6c17 monitoring: Use createTicketLinks helper when showing comments of an object
refs #9611
2015-08-03 10:53:51 +02:00
Eric Lippmann e555e3e3b2 monitoring: Use createTicketLinks helper when showing a service's history
refs #9611
2015-08-03 10:44:53 +02:00
Eric Lippmann 498585d8af monitoring: Use createTicketLinks helper when showing a host's history
refs #9611
2015-08-03 10:43:42 +02:00
Eric Lippmann 6481e97565 Add createTicketLinks() view helper
refs #9611
2015-08-03 10:39:42 +02:00
Eric Lippmann c06ef8dfed Puppet: Use hiera variables in icingaweb2::config::general 2015-08-03 10:38:24 +02:00
Eric Lippmann 226dcd90d5 Merge branch 'feature/vagrant-icinga-box-9453'
resolves #9453
2015-07-31 16:26:13 +02:00
Eric Lippmann 222b91dfd1 Puppet: Fix that openldap core schemas are not correctly installed on Red Hat Linux 7
refs #9453
2015-07-31 16:24:21 +02:00
Eric Lippmann 9379faf9eb Puppet: Add openldap::schema for installing a schema
refs #9453
2015-07-31 16:23:51 +02:00
Eric Lippmann df38e127e1 Puppet: Require php in phpd not vice versa
refs #9453
2015-07-31 16:23:22 +02:00
Eric Lippmann cc1b26be0c Revert "Vagrant: slapd must be running, add provision hint to docs"
This reverts commit f0fc8b8e90.

I'll fix this by introducing dependencies for the schema import.

refs #9453
2015-07-31 15:56:49 +02:00
Johannes Meyer dafa722cec Hide non-essential form fields when configuring LDAP user group backends
resolves #9780
2015-07-31 15:56:13 +02:00
Eric Lippmann 451be1e97f monitoring/hooks: Add TicketHook::createLinks()
Instead of calling preg_replace_callback w/o error handling in our view scripts, TicketHook::createLinks() will take care of that.

refs #9611
2015-07-31 15:31:41 +02:00
Johannes Meyer 5a3401cc28 monitoring: Reduce amount of default quick search columns
Entering an arbitrary pattern in the quick search field will now only search
for a host's and service's display name or a group's / contact's alias.

fixes #9751
2015-07-31 15:15:13 +02:00
Johannes Meyer 27885bee72 Merge branch 'feature/query-limit-plus-one-9661'
resolves #9661
2015-07-31 13:57:27 +02:00
Johannes Meyer 60b0b4cc61 Merge branch 'master' into feature/query-limit-plus-one-9661 2015-07-31 13:57:00 +02:00
Johannes Meyer 99c69cc461 SimpleQuery: Add support for peek aheads
refs #9661
2015-07-31 13:51:39 +02:00
Johannes Meyer fe41d312ca RepositoryQuery: Do not bypass the query's own iterator
refs #9661
2015-07-31 13:12:41 +02:00
Eric Lippmann f4c7fd5408 Merge branch 'bugfix/env-in-source-9615'
fixes #9615
2015-07-31 11:31:54 +02:00
Eric Lippmann 834017f6e5 translation: Always use the correct path to the Icinga library in the translation helper
refs #9615
2015-07-31 11:30:26 +02:00
Johannes Meyer c5b5d3c9c3 SetupException: Provide a default exception message 2015-07-31 11:06:01 +02:00
Johannes Meyer 16e54d3987 DbQuery: Be less error-prone while calling array_search 2015-07-31 11:05:23 +02:00
Johannes Meyer 6c105b867e Form: Be less error-prone while calling array_search 2015-07-31 11:05:09 +02:00
Johannes Meyer 5345831742 SessionNamespace: Be less error-prone while calling array_search 2015-07-31 11:04:51 +02:00
Johannes Meyer 449a19c3a3 Session: Be less error-prone while calling array_search 2015-07-31 11:04:43 +02:00
Johannes Meyer 24cb123f47 Tabs: Be less error-prone while calling array_search 2015-07-31 11:04:36 +02:00
Johannes Meyer 073c61903a DatabaseStep: Be less error-prone while calling array_search 2015-07-31 11:04:26 +02:00
Johannes Meyer 7305edc74c DbTool: Be less error-prone while calling array_search 2015-07-31 11:04:17 +02:00
Johannes Meyer b8293b1fdd WebWizard: Be less error-prone while calling array_search 2015-07-31 11:04:00 +02:00
Johannes Meyer c32b749701 DatabaseStep: Fix schema checks
The step to setup the database considered any table of foreign schemas
as one of our own schema, causing it to never create our schema for
non-empty databases.

fixes #9799
2015-07-31 11:03:12 +02:00
Johannes Meyer 9b051cd7ce reorder-authbackend.phtml: Fix hover styles of icon-only buttons 2015-07-31 08:29:59 +02:00
Eric Lippmann cc0dfedb31 RPM: Install translation config
refs #9615
2015-07-30 16:32:00 +02:00