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

monitoring: Rename remove-downtime to delete-downtime

This commit is contained in:
Eric Lippmann 2015-01-22 16:03:22 +01:00
parent ba7818db5f
commit 251030e1d8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/monitoring/application/views/scripts/list/comments.phtml
View File

@ -80,9 +80,9 @@
$delCommentForm = clone $delCommentForm;
$delCommentForm->populate(array('comment_id' => $comment->id, 'redirect' => $this->url));
if ($comment->objecttype === 'host') {
$delCommentForm->setAction($this->url('monitoring/host/remove-comment', array('host' => $comment->host)));
$delCommentForm->setAction($this->url('monitoring/host/delete-comment', array('host' => $comment->host)));
} else {
$delCommentForm->setAction($this->url('monitoring/service/remove-comment', array('host' => $comment->host, 'service' => $comment->service)));
$delCommentForm->setAction($this->url('monitoring/service/delete-comment', array('host' => $comment->host, 'service' => $comment->service)));
}
echo $delCommentForm;
?>

6
modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
View File

@ -139,16 +139,16 @@ abstract class MonitoredObjectController extends Controller
abstract public function scheduleDowntimeAction();
/**
* Remove a comment
* Delete a comment
*/
public function removeCommentAction()
public function deleteCommentAction()
{
$this->assertHttpMethod('POST');
$this->handleCommandForm(new DeleteCommentCommandForm());
}
/**
* Remove a downtime
* Delete a downtime
*/
public function deleteDowntimeAction()
{