From 48e91e71e50fcf750ecd3d04deee488944c8e25a Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 31 Dec 2008 09:04:18 +0000
Subject: [PATCH] Rename permission_xxx to permissions_xxx for consistency

---
 core/controllers/permissions.php                              | 4 ++--
 .../{permission_edit.html.php => permissions_edit.html.php}   | 0
 .../{permission_form.html.php => permissions_form.html.php}   | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename core/views/{permission_edit.html.php => permissions_edit.html.php} (100%)
 rename core/views/{permission_form.html.php => permissions_form.html.php} (100%)

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
similarity index 100%
rename from core/views/permission_edit.html.php
rename to core/views/permissions_edit.html.php
diff --git a/core/views/permission_form.html.php b/core/views/permissions_form.html.php
similarity index 100%
rename from core/views/permission_form.html.php
rename to core/views/permissions_form.html.php