summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSimon2011-04-13 18:11:13 +0200
committerSimon2011-04-13 18:11:13 +0200
commit9331f0b960ea7a0a20ed55a22c7da9e871a7dfc0 (patch)
tree9572626d1c57195d654aaa53ecebd056b8e9cf3d /application
parentRolle wird nicht kopiert sondern gleiche Rolle wie ersteller wird in der neue... (diff)
downloadpbs2-9331f0b960ea7a0a20ed55a22c7da9e871a7dfc0.tar.gz
pbs2-9331f0b960ea7a0a20ed55a22c7da9e871a7dfc0.tar.xz
pbs2-9331f0b960ea7a0a20ed55a22c7da9e871a7dfc0.zip
Suspend funktioniert nun mit Memberships
Diffstat (limited to 'application')
-rw-r--r--application/modules/user/controllers/GroupController.php19
-rw-r--r--application/modules/user/controllers/PersonController.php17
-rw-r--r--application/modules/user/views/scripts/person/selectmembership.phtml4
3 files changed, 19 insertions, 21 deletions
diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php
index e157575..4bebc52 100644
--- a/application/modules/user/controllers/GroupController.php
+++ b/application/modules/user/controllers/GroupController.php
@@ -111,25 +111,8 @@ 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 {
- $this->rolemapper->save($role);
- } catch(Zend_Exception $e)
- {
- echo "Caught exception: " . get_class($e) . "<br/>";
- echo "Message: " . $e->getMessage() . "<br/>";
- return;
- }
- $roleID = $this->rolemapper->getDbTable()->getDefaultAdapter()->lastInsertId();
- */
+ // setting the actually used role in the new group
$roleID = $this->membership->getRoleID();
- print_a($roleID);
$membership->setID();
$membership->setGroupID($groupID);
$membership->setRoleID($roleID);
diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php
index 25b1f0a..4f6b975 100644
--- a/application/modules/user/controllers/PersonController.php
+++ b/application/modules/user/controllers/PersonController.php
@@ -309,11 +309,24 @@ class user_PersonController extends Zend_Controller_Action
foreach($this->memberships as $membership) {
$group = $groupMapper->find($membership['groupID']);
$role = $roleMapper->find($membership['roleID']);
- $membershipList[] = array(
+ if($membership['suspended'] == 0){
+ $membershipList[] = array(
'membershipID' => $membership['membershipID'],
'group' => $group->getTitle(),
'role' => $role->getTitle()
- );
+ );
+ }
+ else{
+ $suspendlist[] = array(
+ 'membershipID' => $membership['membershipID'],
+ 'group' => $group->getTitle(),
+ 'role' => $role->getTitle());
+ }
+
+ }
+ if(count($suspendlist) >=1){
+ $pbsNotifier = new Pbs_Notifier();
+ $this->view->notification = $pbsNotifier->notify("Actually ".count($suspendlist)." Memberships are suspended", 'error' );
}
}
$membershipSelectForm = new user_Form_MembershipSelect(array('membershiplist' => $membershipList));
diff --git a/application/modules/user/views/scripts/person/selectmembership.phtml b/application/modules/user/views/scripts/person/selectmembership.phtml
index 5f7e5bf..f5c18a3 100644
--- a/application/modules/user/views/scripts/person/selectmembership.phtml
+++ b/application/modules/user/views/scripts/person/selectmembership.phtml
@@ -1,5 +1,7 @@
<h1>Select Membership</h1>
+<?php if($this->notification != ''){echo $this->notification;} ?>
+
<?php
$this->membershipSelectForm->setAction($this->url());
echo $this->membershipSelectForm;
-?> \ No newline at end of file
+?>