summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
authorSimon2011-04-13 16:19:22 +0200
committerSimon2011-04-13 16:19:22 +0200
commitc69e26c34caf57c0fb383a1acf7af523c54d885b (patch)
tree91b3673f473c0a08c94284234deae5f7438d8cc0 /application/modules
parentkleines bugfix in own details (diff)
downloadpbs2-c69e26c34caf57c0fb383a1acf7af523c54d885b.tar.gz
pbs2-c69e26c34caf57c0fb383a1acf7af523c54d885b.tar.xz
pbs2-c69e26c34caf57c0fb383a1acf7af523c54d885b.zip
Suspend auf 0 gesetzt in Membership
Diffstat (limited to 'application/modules')
-rw-r--r--application/modules/user/controllers/GroupController.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index e36bba7..2d4fc64 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -275,6 +275,8 @@ class User_GroupController extends Zend_Controller_Action
public function linkAction()
{
+ if(!Pbs_Acl::checkRight('glk'))
+ $this->_redirect('/user');
if (!isset($_POST["link"])){
$linkForm = new user_Form_GroupLink(array('grouplist' => $this->groupList));
} else {
@@ -304,7 +306,7 @@ class User_GroupController extends Zend_Controller_Action
{
// ACL delete a group
if(!Pbs_Acl::checkRight('gd'))
- $this->_redirect('/user');
+ $this->_redirect('/user');
$this->_helper->viewRenderer->setNoRender();
$groupID = $this->_request->getParam('groupID');
@@ -343,7 +345,7 @@ class User_GroupController extends Zend_Controller_Action
{
// ACL grant a membership to request
if(!Pbs_Acl::checkRight('gam'))
- $this->_redirect('/user');
+ $this->_redirect('/user');
$this->_helper->viewRenderer->setNoRender();
if(isset($_POST['grouprequestID']) && isset($_POST['roleID'])) {
@@ -358,8 +360,9 @@ class User_GroupController extends Zend_Controller_Action
}
$membership = new Application_Model_Membership();
$membership->setGroupID($groupRequest->getGroupID());
- $membership->setPersonID($groupRequest->getPersonID());
+ $membership->setPersonID($groupRequest->getPersonID());
$membership->setRoleID($_POST['roleID']);
+ $membership->setSuspended(0);
try {
$id = $this->membershipMapper->save($membership);