From fff2d5c816cdd12d7aca63123d5d0b4e16ff3922 Mon Sep 17 00:00:00 2001 From: Matthias Jentsch Date: Thu, 7 May 2015 17:29:46 +0200 Subject: [PATCH] Use consistent controller names refs #8624 --- .../monitoring/application/controllers/CommentsController.php | 4 ++-- .../application/controllers/DowntimesController.php | 4 ++-- .../scripts/comments/{remove-all.phtml => delete-all.phtml} | 0 .../scripts/downtimes/{remove-all.phtml => delete-all.phtml} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename modules/monitoring/application/views/scripts/comments/{remove-all.phtml => delete-all.phtml} (100%) rename modules/monitoring/application/views/scripts/downtimes/{remove-all.phtml => delete-all.phtml} (100%) diff --git a/modules/monitoring/application/controllers/CommentsController.php b/modules/monitoring/application/controllers/CommentsController.php index 64eeeb361d..e9a885dbe1 100644 --- a/modules/monitoring/application/controllers/CommentsController.php +++ b/modules/monitoring/application/controllers/CommentsController.php @@ -70,14 +70,14 @@ public function showAction() $this->view->comments = $this->comments; $this->view->listAllLink = Url::fromPath('monitoring/list/comments') ->setQueryString($this->filter->toQueryString()); - $this->view->removeAllLink = Url::fromPath('monitoring/comments/remove-all') + $this->view->removeAllLink = Url::fromPath('monitoring/comments/delete-all') ->setParams($this->params); } /** * Display the form for removing a comment list */ - public function removeAllAction() + public function deleteAllAction() { $this->assertPermission('monitoring/command/comment/delete'); diff --git a/modules/monitoring/application/controllers/DowntimesController.php b/modules/monitoring/application/controllers/DowntimesController.php index a5d49cd97c..dfd5a6758a 100644 --- a/modules/monitoring/application/controllers/DowntimesController.php +++ b/modules/monitoring/application/controllers/DowntimesController.php @@ -104,14 +104,14 @@ public function showAction() $this->view->downtimes = $this->downtimes; $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes') ->setQueryString($this->filter->toQueryString()); - $this->view->removeAllLink = Url::fromPath('monitoring/downtimes/remove-all') + $this->view->removeAllLink = Url::fromPath('monitoring/downtimes/delete-all') ->setParams($this->params); } /** * Display the form for removing a downtime list */ - public function removeAllAction() + public function deleteAllAction() { $this->assertPermission('monitoring/command/downtime/delete'); $this->view->downtimes = $this->downtimes; diff --git a/modules/monitoring/application/views/scripts/comments/remove-all.phtml b/modules/monitoring/application/views/scripts/comments/delete-all.phtml similarity index 100% rename from modules/monitoring/application/views/scripts/comments/remove-all.phtml rename to modules/monitoring/application/views/scripts/comments/delete-all.phtml diff --git a/modules/monitoring/application/views/scripts/downtimes/remove-all.phtml b/modules/monitoring/application/views/scripts/downtimes/delete-all.phtml similarity index 100% rename from modules/monitoring/application/views/scripts/downtimes/remove-all.phtml rename to modules/monitoring/application/views/scripts/downtimes/delete-all.phtml