mirror of https://github.com/MISP/MISP
RBAC
so role is editable. (i will not commit/push during after hours ;) )pull/63/head
parent
732ac3609f
commit
8bf8ef17ca
|
@ -46,7 +46,7 @@
|
||||||
Router::connect('/admin/users/login', array('controller' => 'users', 'action' => 'login'));
|
Router::connect('/admin/users/login', array('controller' => 'users', 'action' => 'login'));
|
||||||
Router::connect('/admin/users/routeafterlogin', array('controller' => 'users', 'action' => 'routeafterlogin'));
|
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('/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')));
|
//Router::connect('/:controller/:field/:newValue/:oldValue', array('action' => 'call'), array('pass' => array('field', 'newValue', 'oldValue')));
|
||||||
|
|
||||||
|
|
|
@ -220,6 +220,7 @@ class UsersController extends AppController {
|
||||||
* @throws NotFoundException
|
* @throws NotFoundException
|
||||||
*/
|
*/
|
||||||
public function admin_edit($id = null) {
|
public function admin_edit($id = null) {
|
||||||
|
// debug($fields);debug(tru);
|
||||||
$this->User->id = $id;
|
$this->User->id = $id;
|
||||||
if (!$this->User->exists()) {
|
if (!$this->User->exists()) {
|
||||||
throw new NotFoundException(__('Invalid user'));
|
throw new NotFoundException(__('Invalid user'));
|
||||||
|
@ -239,6 +240,7 @@ class UsersController extends AppController {
|
||||||
if ("" != $this->request->data['User']['password'])
|
if ("" != $this->request->data['User']['password'])
|
||||||
$fields[] = 'password';
|
$fields[] = 'password';
|
||||||
$fields[] = 'role_id';
|
$fields[] = 'role_id';
|
||||||
|
// debug($fields);debug(tru);
|
||||||
if ($this->User->save($this->request->data, true, $fields)) {
|
if ($this->User->save($this->request->data, true, $fields)) {
|
||||||
// TODO Audit, extraLog, fields compare
|
// TODO Audit, extraLog, fields compare
|
||||||
// newValues to array
|
// newValues to array
|
||||||
|
|
Loading…
Reference in New Issue