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 #2914 from Icinga/fix/api-command-ack-wo-expire 

API Commands: Only send acknowledgement expire time if not null
This commit is contained in:
lippserd 2017-08-09 13:29:10 +02:00 committed by GitHub
parent 75b6d5009a 2c312adf94
commit 16f9fa35c9
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/library/Monitoring/Command/Renderer/IcingaApiCommandRenderer.php
View File

@ -179,10 +179,12 @@ class IcingaApiCommandRenderer implements IcingaCommandRendererInterface
$data = array( $data = array(
'author' => $command->getAuthor(), 'author' => $command->getAuthor(),
'comment' => $command->getComment(), 'comment' => $command->getComment(),
'expiry' => $command->getExpireTime(),
'sticky' => $command->getSticky(), 'sticky' => $command->getSticky(),
'notify' => $command->getNotify() 'notify' => $command->getNotify()
); );
if ($command->getExpireTime() !== null) {
$data['expiry'] = $command->getExpireTime();
}
$this->applyFilter($data, $command->getObject()); $this->applyFilter($data, $command->getObject());
return IcingaApiCommand::create($endpoint, $data); return IcingaApiCommand::create($endpoint, $data);
} }