From f02c5e6f1dd516e677b054f32d110012e969eafd Mon Sep 17 00:00:00 2001 From: Alexander Fuhr Date: Fri, 12 Jun 2015 12:07:53 +0200 Subject: [PATCH] UserGroup: Conform the class and file naming --- application/controllers/ListController.php | 2 +- application/controllers/ObjectController.php | 2 +- .../forms/{IcingaUsergroupForm.php => IcingaUserGroupForm.php} | 2 +- .../{IcingaUsergroupTable.php => IcingaUserGroupTable.php} | 2 +- .../Objects/{IcingaUsergroup.php => IcingaUserGroup.php} | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename application/forms/{IcingaUsergroupForm.php => IcingaUserGroupForm.php} (97%) rename application/tables/{IcingaUsergroupTable.php => IcingaUserGroupTable.php} (96%) rename library/Director/Objects/{IcingaUsergroup.php => IcingaUserGroup.php} (89%) diff --git a/application/controllers/ListController.php b/application/controllers/ListController.php index 3e6edc41..f6dba74e 100644 --- a/application/controllers/ListController.php +++ b/application/controllers/ListController.php @@ -143,7 +143,7 @@ class Director_ListController extends ActionController 'director/object/usergroup' ); $this->view->title = $this->translate('Icinga Usergroups'); - $this->view->table = $this->loadTable('icingaUsergroup')->setConnection($this->db()); + $this->view->table = $this->loadTable('icingaUserGroup')->setConnection($this->db()); $this->render('table'); } diff --git a/application/controllers/ObjectController.php b/application/controllers/ObjectController.php index 56657b1b..ac39b339 100644 --- a/application/controllers/ObjectController.php +++ b/application/controllers/ObjectController.php @@ -204,7 +204,7 @@ class Director_ObjectController extends ActionController public function usergroupAction() { - $this->view->form = $this->loadForm('icingaUsergroup') + $this->view->form = $this->loadForm('icingaUserGroup') ->setDb($this->db()) ->setSuccessUrl('director/list/usergroups'); diff --git a/application/forms/IcingaUsergroupForm.php b/application/forms/IcingaUserGroupForm.php similarity index 97% rename from application/forms/IcingaUsergroupForm.php rename to application/forms/IcingaUserGroupForm.php index 938cd93c..a3dff7e1 100644 --- a/application/forms/IcingaUsergroupForm.php +++ b/application/forms/IcingaUserGroupForm.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Forms; use Icinga\Module\Director\Web\Form\DirectorObjectForm; -class IcingaUsergroupForm extends DirectorObjectForm +class IcingaUserGroupForm extends DirectorObjectForm { public function setup() { diff --git a/application/tables/IcingaUsergroupTable.php b/application/tables/IcingaUserGroupTable.php similarity index 96% rename from application/tables/IcingaUsergroupTable.php rename to application/tables/IcingaUserGroupTable.php index d2c4918b..60a287fe 100644 --- a/application/tables/IcingaUsergroupTable.php +++ b/application/tables/IcingaUserGroupTable.php @@ -4,7 +4,7 @@ namespace Icinga\Module\Director\Tables; use Icinga\Module\Director\Web\Table\QuickTable; -class IcingaUsergroupTable extends QuickTable +class IcingaUserGroupTable extends QuickTable { public function getColumns() { diff --git a/library/Director/Objects/IcingaUsergroup.php b/library/Director/Objects/IcingaUserGroup.php similarity index 89% rename from library/Director/Objects/IcingaUsergroup.php rename to library/Director/Objects/IcingaUserGroup.php index 075770c4..f1edb8ec 100644 --- a/library/Director/Objects/IcingaUsergroup.php +++ b/library/Director/Objects/IcingaUserGroup.php @@ -2,7 +2,7 @@ namespace Icinga\Module\Director\Objects; -class IcingaUsergroup extends IcingaObject +class IcingaUserGroup extends IcingaObject { protected $table = 'icinga_usergroup';