parent
7fcfc01464
commit
a4744fa550
|
@ -45,45 +45,20 @@ class SecurityController extends ActionController
|
||||||
$this->view->form = $role;
|
$this->view->form = $role;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function newPermissionAction()
|
public function updateRoleAction()
|
||||||
{
|
{
|
||||||
$permission = new PermissionForm(array(
|
$name = $this->_request->getParam('role');
|
||||||
'onSuccess' => function (Request $request, PermissionForm $permission) {
|
|
||||||
$name = $permission->getElement('name')->getValue();
|
|
||||||
$values = $permission->getValues();
|
|
||||||
try {
|
|
||||||
$permission->add($name, $values);
|
|
||||||
} catch (InvalidArgumentException $e) {
|
|
||||||
$permission->addError($e->getMessage());
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if ($permission->save()) {
|
|
||||||
Notification::success(t('Permissions granted'));
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
));
|
|
||||||
$permission
|
|
||||||
->setIniConfig(Config::app('permissions', true))
|
|
||||||
->setRedirectUrl('security')
|
|
||||||
->handleRequest();
|
|
||||||
$this->view->form = $permission;
|
|
||||||
}
|
|
||||||
|
|
||||||
public function updatePermissionAction()
|
|
||||||
{
|
|
||||||
$name = $this->_request->getParam('permission');
|
|
||||||
if (empty($name)) {
|
if (empty($name)) {
|
||||||
throw new Zend_Controller_Action_Exception(
|
throw new Zend_Controller_Action_Exception(
|
||||||
sprintf($this->translate('Required parameter \'%s\' missing'), 'permission'),
|
sprintf($this->translate('Required parameter \'%s\' missing'), 'role'),
|
||||||
400
|
400
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$permission = new PermissionForm();
|
$role = new RoleForm();
|
||||||
|
$role->setSubmitLabel($this->translate('Update Role'));
|
||||||
try {
|
try {
|
||||||
$permission
|
$role
|
||||||
->setIniConfig(Config::app('permissions', true))
|
->setIniConfig(Config::app('roles', true))
|
||||||
->load($name);
|
->load($name);
|
||||||
} catch (InvalidArgumentException $e) {
|
} catch (InvalidArgumentException $e) {
|
||||||
throw new Zend_Controller_Action_Exception(
|
throw new Zend_Controller_Action_Exception(
|
||||||
|
@ -91,19 +66,19 @@ class SecurityController extends ActionController
|
||||||
400
|
400
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$permission
|
$role
|
||||||
->setOnSuccess(function (Request $request, PermissionForm $permission) use ($name) {
|
->setOnSuccess(function (RoleForm $role) use ($name) {
|
||||||
$oldName = $name;
|
$oldName = $name;
|
||||||
$name = $permission->getElement('name')->getValue();
|
$name = $role->getElement('name')->getValue();
|
||||||
$values = $permission->getValues();
|
$values = $role->getValues();
|
||||||
try {
|
try {
|
||||||
$permission->update($name, $values, $oldName);
|
$role->update($name, $values, $oldName);
|
||||||
} catch (InvalidArgumentException $e) {
|
} catch (InvalidArgumentException $e) {
|
||||||
$permission->addError($e->getMessage());
|
$role->addError($e->getMessage());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if ($permission->save()) {
|
if ($role->save()) {
|
||||||
Notification::success(t('Permissions granted'));
|
Notification::success(t('Role updated'));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
@ -111,7 +86,7 @@ class SecurityController extends ActionController
|
||||||
->setRedirectUrl('security')
|
->setRedirectUrl('security')
|
||||||
->handleRequest();
|
->handleRequest();
|
||||||
$this->view->name = $name;
|
$this->view->name = $name;
|
||||||
$this->view->form = $permission;
|
$this->view->form = $role;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function removePermissionAction()
|
public function removePermissionAction()
|
||||||
|
|
Loading…
Reference in New Issue