summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2008-12-31 09:04:18 +0000
committerBharat Mediratta <bharat@menalto.com>2008-12-31 09:04:18 +0000
commit48e91e71e50fcf750ecd3d04deee488944c8e25a (patch)
treed676aac20314d99dbbfe8e535666ae8d467a57cf
parent610494296b7cb52e52ebcc99246bb48da9252546 (diff)
Rename permission_xxx to permissions_xxx for consistency
-rw-r--r--core/controllers/permissions.php4
-rw-r--r--core/views/permissions_edit.html.php (renamed from core/views/permission_edit.html.php)0
-rw-r--r--core/views/permissions_form.html.php (renamed from core/views/permission_form.html.php)0
3 files changed, 2 insertions, 2 deletions
diff --git a/core/controllers/permissions.php b/core/controllers/permissions.php
index 24ce7312..67b75782 100644
--- a/core/controllers/permissions.php
+++ b/core/controllers/permissions.php
@@ -26,7 +26,7 @@ class Permissions_Controller extends Controller {
access::forbidden();
}
- $view = new View("permission_edit.html");
+ $view = new View("permissions_edit.html");
$view->item = $item;
$view->parents = $item->parents();
$view->form = $this->_get_form($item);
@@ -46,7 +46,7 @@ class Permissions_Controller extends Controller {
}
function _get_form($item) {
- $view = new View("permission_form.html");
+ $view = new View("permissions_form.html");
$view->item = $item;
$view->groups = ORM::factory("group")->find_all();
$view->permissions = ORM::factory("permission")->find_all();
diff --git a/core/views/permission_edit.html.php b/core/views/permissions_edit.html.php
index ee561091..ee561091 100644
--- a/core/views/permission_edit.html.php
+++ b/core/views/permissions_edit.html.php
diff --git a/core/views/permission_form.html.php b/core/views/permissions_form.html.php
index 4933d6f2..4933d6f2 100644
--- a/core/views/permission_form.html.php
+++ b/core/views/permissions_form.html.php