summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/GroupController.php
diff options
context:
space:
mode:
authorSimon2011-04-13 17:56:31 +0200
committerSimon2011-04-13 17:56:31 +0200
commit53bb21d568f085ae496b3a33697575bea070a995 (patch)
tree0aa8b3cad978c4af76f3f64ffde9b9a673e8953b /application/modules/user/controllers/GroupController.php
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-53bb21d568f085ae496b3a33697575bea070a995.tar.gz
pbs2-53bb21d568f085ae496b3a33697575bea070a995.tar.xz
pbs2-53bb21d568f085ae496b3a33697575bea070a995.zip
Rolle wird nicht kopiert sondern gleiche Rolle wie ersteller wird in der neuen Gruppe benutzt
Diffstat (limited to 'application/modules/user/controllers/GroupController.php')
-rw-r--r--application/modules/user/controllers/GroupController.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index 0502a34..e157575 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -111,9 +111,11 @@ class User_GroupController extends Zend_Controller_Action
}
$groupID = $this->groupMapper->getDbTable()->getDefaultAdapter()->lastInsertId();
$membership = $this->membershipMapper->find($this->userIDsNamespace['membershipID']);
+ /*
$role = $this->rolemapper->find($membership->getRoleID());
$rightrolesMapper = new Application_Model_RightRolesMapper();
$rightroleslist = $rightrolesMapper->findBy(array('roleID' => $membership->getRoleID()));
+
$role->setGroupID($groupID);
$role->setID();
try {
@@ -125,9 +127,13 @@ class User_GroupController extends Zend_Controller_Action
return;
}
$roleID = $this->rolemapper->getDbTable()->getDefaultAdapter()->lastInsertId();
+ */
+ $roleID = $this->membership->getRoleID();
+ print_a($roleID);
$membership->setID();
$membership->setGroupID($groupID);
$membership->setRoleID($roleID);
+
try {
$this->membershipMapper->save($membership);
} catch(Zend_Exception $e)
@@ -173,7 +179,7 @@ class User_GroupController extends Zend_Controller_Action
public function editAction()
{
// ACL edit a group
- if(!Pbs_Acl::checkRight('geo') && !Pbs_Acl::checkRight('geo'))
+ if(!Pbs_Acl::checkRight('geo') && !Pbs_Acl::checkRight('ge'))
$this->_redirect('/user');
$groupID = $this->_request->getParam('groupID');