From 8bf8ef17ca8de16e8841ef4b1e3d221538ee8119 Mon Sep 17 00:00:00 2001 From: Noud de Brouwer Date: Tue, 22 Jan 2013 18:37:30 +0000 Subject: [PATCH] RBAC so role is editable. (i will not commit/push during after hours ;) ) --- app/Config/routes.php | 2 +- app/Controller/UsersController.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Config/routes.php b/app/Config/routes.php index 8228c2f78..00b22263c 100755 --- a/app/Config/routes.php +++ b/app/Config/routes.php @@ -46,7 +46,7 @@ Router::connect('/admin/users/login', array('controller' => 'users', 'action' => 'login')); Router::connect('/admin/users/routeafterlogin', array('controller' => 'users', 'action' => 'routeafterlogin')); - Router::connect('/admin/users/edit/:id', array('controller' => 'users', 'action' => 'edit'), array('pass' => array('field', 'id'))); +// Router::connect('/admin/users/edit/:id', array('controller' => 'users', 'action' => 'edit'), array('pass' => array('field', 'id'))); Router::connect('/admin/users/view/:id', array('controller' => 'users', 'action' => 'view'), array('pass' => array('field', 'id'))); //Router::connect('/:controller/:field/:newValue/:oldValue', array('action' => 'call'), array('pass' => array('field', 'newValue', 'oldValue'))); diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php index 595bd05c7..0840e33ef 100755 --- a/app/Controller/UsersController.php +++ b/app/Controller/UsersController.php @@ -220,6 +220,7 @@ class UsersController extends AppController { * @throws NotFoundException */ public function admin_edit($id = null) { +// debug($fields);debug(tru); $this->User->id = $id; if (!$this->User->exists()) { throw new NotFoundException(__('Invalid user')); @@ -239,6 +240,7 @@ class UsersController extends AppController { if ("" != $this->request->data['User']['password']) $fields[] = 'password'; $fields[] = 'role_id'; +// debug($fields);debug(tru); if ($this->User->save($this->request->data, true, $fields)) { // TODO Audit, extraLog, fields compare // newValues to array