summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/RoleController.php
diff options
context:
space:
mode:
authorSimon2011-04-05 12:58:56 +0200
committerSimon2011-04-05 12:58:56 +0200
commitd106362ad158554ee09debf48ec0249ef8e2c599 (patch)
treeb52279d6a1ba80ad3417a7ffd8853ee50c061a00 /application/modules/user/controllers/RoleController.php
parentUnterstriche in Spaltentitel erlaubt(danke Michi...) (diff)
parentweiteres Recht hinzugefügt (diff)
downloadpbs2-d106362ad158554ee09debf48ec0249ef8e2c599.tar.gz
pbs2-d106362ad158554ee09debf48ec0249ef8e2c599.tar.xz
pbs2-d106362ad158554ee09debf48ec0249ef8e2c599.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers/RoleController.php')
-rw-r--r--application/modules/user/controllers/RoleController.php22
1 files changed, 17 insertions, 5 deletions
diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php
index 059d9c4..38c12b0 100644
--- a/application/modules/user/controllers/RoleController.php
+++ b/application/modules/user/controllers/RoleController.php
@@ -2,7 +2,7 @@
class User_RoleController extends Zend_Controller_Action
{
- protected $userIDsNamespace;
+ protected $userIDsNamespace = null;
public function init()
{
@@ -76,8 +76,8 @@ class User_RoleController extends Zend_Controller_Action
}
}
}
- //$this->_helper->redirector('', 'role');
- //return;
+ $this->_helper->redirector('', 'role');
+ return;
}
}
@@ -127,7 +127,15 @@ class User_RoleController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $this->_redirect($_SERVER['HTTP_REFERER']);
+ if($_SERVER['HTTP_REFERER']) {
+ $this->_redirect($_SERVER['HTTP_REFERER']);
+ } else {
+ if(isset($roleID)) {
+ $this->_redirect('/user/role/show/roleID/' . $roleID);
+ } else {
+ $this->_helper->redirector('', 'role');
+ }
+ }
return;
}
}
@@ -215,7 +223,11 @@ class User_RoleController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- $this->_helper->redirector('', 'role');
+ if(strpos($_SERVER['HTTP_REFERER'], '/user/role/show') !== false && strpos($_SERVER['HTTP_REFERER'], '/roleID/') === false) {
+ $this->_helper->redirector('changemembership', 'person');
+ } else {
+ $this->_helper->redirector('', 'role');
+ }
return;
} else {
$pbsNotifier = new Pbs_Notifier();