tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3126 from mapa82/master 

Monitoring: add setting acknowledge_expire_time
This commit is contained in:
lippserd 2018-01-17 12:18:00 +01:00 committed by GitHub
parent f92c35c193 9b81492e8b
commit 375b140c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -76,6 +76,7 @@ baufrecht <baufrecht@users.noreply.github.com>
bradynathan <bradynathan@gmail.com> bradynathan <bradynathan@gmail.com>
cstegm <cstegm@users.noreply.github.com> cstegm <cstegm@users.noreply.github.com>
hailthemelody@rm-laptop04 <hailthemelody@rm-laptop04> hailthemelody@rm-laptop04 <hailthemelody@rm-laptop04>
mapa82 <maik.paetzold@akra.de>
mbaschnitzi <mbaschnitzi@users.noreply.github.com> mbaschnitzi <mbaschnitzi@users.noreply.github.com>
rbelinsky <rbelinsky@dalet.com> rbelinsky <rbelinsky@dalet.com>
realitygaps <github@gapsinreality.com> realitygaps <github@gapsinreality.com>

2
modules/monitoring/application/forms/Command/Object/AcknowledgeProblemCommandForm.php
View File

@ -88,7 +88,7 @@ class AcknowledgeProblemCommandForm extends ObjectsCommandForm
$expire = isset($formData['expire']) ? $formData['expire'] : $acknowledgeExpire; $expire = isset($formData['expire']) ? $formData['expire'] : $acknowledgeExpire;
if ($expire) { if ($expire) {
$expireTime = new DateTime(); $expireTime = new DateTime();
$expireTime->add(new DateInterval('PT1H')); $expireTime->add(new DateInterval($config->get('settings', 'acknowledge_expire_time', 'PT1H')));
$this->addElement( $this->addElement(
'dateTimePicker', 'dateTimePicker',
'expire_time', 'expire_time',