diff options
| author | Simon | 2011-03-28 15:50:20 +0200 |
|---|---|---|
| committer | Simon | 2011-03-28 15:50:20 +0200 |
| commit | 62484738b5180617e2750b12ce02ff452386dbc8 (patch) | |
| tree | 9ab03eace520be7861c3f039354e77ec71741b1e /application | |
| parent | Zeitformat im Filtertype korrigiert (diff) | |
| parent | kleine Korrektur (diff) | |
| download | pbs2-62484738b5180617e2750b12ce02ff452386dbc8.tar.gz pbs2-62484738b5180617e2750b12ce02ff452386dbc8.tar.xz pbs2-62484738b5180617e2750b12ce02ff452386dbc8.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application')
| -rw-r--r-- | application/modules/user/controllers/RoleController.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php index 62d1550..d2491ff 100644 --- a/application/modules/user/controllers/RoleController.php +++ b/application/modules/user/controllers/RoleController.php @@ -67,6 +67,9 @@ class User_RoleController extends Zend_Controller_Action { $roleID = $this->_request->getParam('roleID'); if(!isset($roleID)) { + $roleID = $this->userIDsNamespace['roleID']; + } + if(!isset($roleID)) { $addForm = new user_Form_RoleAdd(); $this->view->addForm = $addForm; return; @@ -106,6 +109,9 @@ class User_RoleController extends Zend_Controller_Action public function showAction() { $roleID = $this->_request->getParam('roleID'); + if(!isset($roleID)) { + $roleID = $this->userIDsNamespace['roleID']; + } if($roleID) { $rightroles = $this->rightRolesMapper->findBy('roleID', $roleID); if(count($rightroles) > 0) { @@ -128,6 +134,9 @@ class User_RoleController extends Zend_Controller_Action public function deleteAction() { $this->_helper->viewRenderer->setNoRender(); + if(!isset($roleID)) { + $roleID = $this->userIDsNamespace['roleID']; + } $roleID = $this->_request->getParam('roleID'); if (isset($roleID)){ $role = $this->roleMapper->find($roleID); @@ -150,6 +159,9 @@ class User_RoleController extends Zend_Controller_Action public function linkrightAction() { $roleID = $this->_request->getParam('roleID'); + if(!isset($roleID)) { + $roleID = $this->userIDsNamespace['roleID']; + } if(isset($roleID)) { $rightroles = $this->rightRolesMapper->findBy('roleID', $roleID); $rights = $this->rightMapper->fetchAll(); |