diff options
| author | Simon | 2011-03-28 15:09:04 +0200 |
|---|---|---|
| committer | Simon | 2011-03-28 15:09:04 +0200 |
| commit | 7f128bfd11824b832e4e64a1b13011e837c54366 (patch) | |
| tree | 5806900894bac7374bb5c655752afffb88d489a8 /application/modules/user/controllers/GroupController.php | |
| parent | quickfix gegen account löschen (diff) | |
| parent | Einführung von Vererbung von Rollen (diff) | |
| download | pbs2-7f128bfd11824b832e4e64a1b13011e837c54366.tar.gz pbs2-7f128bfd11824b832e4e64a1b13011e837c54366.tar.xz pbs2-7f128bfd11824b832e4e64a1b13011e837c54366.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers/GroupController.php')
| -rw-r--r-- | application/modules/user/controllers/GroupController.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php index 3180ebd..1ceb844 100644 --- a/application/modules/user/controllers/GroupController.php +++ b/application/modules/user/controllers/GroupController.php @@ -110,7 +110,15 @@ class User_GroupController extends Zend_Controller_Action echo "Message: " . $e->getMessage() . "<br/>"; return; } - $this->_helper->redirector('', 'group'); + if(strpos($_SERVER['HTTP_REFERER'], '/user/group/show')) { + if(strpos($_SERVER['HTTP_REFERER'], '/groupID/')) { + $this->_redirect('/user/group/groupID/' . $groupID); + } else { + $this->_helper->redirector('show', 'group'); + } + } else { + $this->_helper->redirector('showall', 'group'); + } return; } } @@ -210,7 +218,7 @@ class User_GroupController extends Zend_Controller_Action } if(strpos($_SERVER['HTTP_REFERER'], '/user/group/show')) { if(strpos($_SERVER['HTTP_REFERER'], '/groupID/')) { - $this->_redirect('/user/group/show/groupID/' . $groupID); + $this->_redirect('/user/group/showall'); } else { $this->_helper->redirector('changemembership', 'person'); } |