summaryrefslogtreecommitdiffstats
path: root/application/modules/dev/controllers/GroupController.php
diff options
context:
space:
mode:
authorBjörn Geiger2011-03-17 14:03:43 +0100
committerBjörn Geiger2011-03-17 14:03:43 +0100
commita26061089a91bf3a214d6a0dba9ffad8a7006a61 (patch)
tree718ef3992621aba600e39f877f9c9068e17662ca /application/modules/dev/controllers/GroupController.php
parentClientMapper return value (diff)
downloadpbs2-a26061089a91bf3a214d6a0dba9ffad8a7006a61.tar.gz
pbs2-a26061089a91bf3a214d6a0dba9ffad8a7006a61.tar.xz
pbs2-a26061089a91bf3a214d6a0dba9ffad8a7006a61.zip
Person und Gruppen, Fehler korrigiert + Layout
Diffstat (limited to 'application/modules/dev/controllers/GroupController.php')
-rw-r--r--application/modules/dev/controllers/GroupController.php61
1 files changed, 39 insertions, 22 deletions
diff --git a/application/modules/dev/controllers/GroupController.php b/application/modules/dev/controllers/GroupController.php
index 1a063a7..c86e4fe 100644
--- a/application/modules/dev/controllers/GroupController.php
+++ b/application/modules/dev/controllers/GroupController.php
@@ -20,8 +20,9 @@ class dev_GroupController extends Zend_Controller_Action
$this->personmapper = new Application_Model_PersonMapper();
$this->rolemapper = new Application_Model_RoleMapper();
$this->groupList = $this->groupMapper->fetchAll();
- } else {
- $this->_redirect('/dev/login/auth');
+ } else {
+ $this->_helper->redirector('login', 'auth');
+ return;
}
}
@@ -62,7 +63,8 @@ class dev_GroupController extends Zend_Controller_Action
}
}
- echo "Group successfully added. <br/>";
+ $this->_helper->redirector('', 'group');
+ return;
}
}
@@ -71,13 +73,14 @@ class dev_GroupController extends Zend_Controller_Action
public function editAction()
{
- if(!isset($_POST['groupID'])) {
+ $groupID = $this->_request->getParam('groupID');
+ if(!isset($groupID)) {
$addForm = new dev_Form_GroupAdd(array('grouplist' => $this->groupList));
$this->view->addForm = $addForm;
return;
}
if (!isset($_POST["save"])){
- $group = $this->groupMapper->find($_POST['groupID']);
+ $group = $this->groupMapper->find($groupID);
$_POST['title'] = $group->getTitle();
$_POST['description'] = $group->getDescription();
$editForm = new dev_Form_GroupEdit();
@@ -94,7 +97,8 @@ class dev_GroupController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- echo "Successfully saved. <br/>";
+ $this->_helper->redirector('', 'group');
+ return;
}
}
@@ -103,8 +107,9 @@ class dev_GroupController extends Zend_Controller_Action
public function showAction()
{
- if($_POST['groupID']) {
- $groupRequests = $this->groupRequestMapper->findBy('groupID', $_POST['groupID']);
+ $groupID = $this->_request->getParam('groupID');
+ if($groupID) {
+ $groupRequests = $this->groupRequestMapper->findBy('groupID', $groupID);
if(isset($groupRequests)) {
foreach($groupRequests as $groupRequest) {
$person = $this->personmapper->find($groupRequest['personID']);
@@ -113,10 +118,12 @@ class dev_GroupController extends Zend_Controller_Action
'person' => $person
);
}
- $this->view->groupRequestList = $groupRequestList;
- $this->view->roleList = $this->rolemapper->findBy('groupID', $_POST['groupID']);
+ if(is_array($groupRequestList)) {
+ $this->view->groupRequestList = $groupRequestList;
+ }
+ $this->view->roleList = $this->rolemapper->findBy('groupID', $groupID);
}
- $members = $this->membershipMapper->findBy('groupID', $_POST['groupID']);
+ $members = $this->membershipMapper->findBy('groupID', $groupID);
if(isset($members)) {
foreach($members as $member) {
$person = $this->personmapper->find($member['personID']);
@@ -125,15 +132,18 @@ class dev_GroupController extends Zend_Controller_Action
'person' => $person
);
}
- $this->view->memberslist = $membersList;
+ if(is_array($membersList)) {
+ $this->view->membersList = $membersList;
+ }
}
- $groupgroups = $this->groupGroupsMapper->findBy('groupID', $_POST['groupID']);
+ $groupgroups = $this->groupGroupsMapper->findBy('groupID', $groupID);
if(is_object($groupgroups)) {
$parentGroup = $this->groupMapper->find($groupgroups->getParentID());
$this->view->$parentGroup = $parentGroup;
}
- $group = $this->groupMapper->find($_POST['groupID']);
+ $group = $this->groupMapper->find($groupID);
$this->view->group = $group;
+ $this->view->groupID = $groupID;
}
}
@@ -156,7 +166,8 @@ class dev_GroupController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- echo "Groups successfully linked. <br/>";
+ $this->_helper->redirector('', 'group');
+ return;
}
}
@@ -165,8 +176,10 @@ class dev_GroupController extends Zend_Controller_Action
public function deleteAction()
{
- if (isset($_POST["groupID"])){
- $group = $this->groupMapper->find($_POST["groupID"]);
+ $this->_helper->viewRenderer->setNoRender();
+ $groupID = $this->_request->getParam('groupID');
+ if (isset($groupID)){
+ $group = $this->groupMapper->find($groupID);
try {
$this->groupMapper->delete($group);
} catch(Zend_Exception $e)
@@ -175,12 +188,14 @@ class dev_GroupController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- echo "Group successfully deleted. <br/>";
+ $this->_helper->redirector('', 'group');
+ return;
}
}
public function grantpersonAction()
{
+ $this->_helper->viewRenderer->setNoRender();
if(isset($_POST['grouprequestID']) && isset($_POST['roleID'])) {
$groupRequest = $this->groupRequestMapper->find($_POST['grouprequestID']);
try {
@@ -203,14 +218,16 @@ class dev_GroupController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- echo "Chosen Person has been successfully added to the chosen group. <br />";
+ $this->_redirect("/dev/group/show/groupID/" . $groupRequest->getGroupID());
}
}
public function revokepersonAction()
{
- if(isset($_POST['membershipID'])) {
- $membership = $this->membershipMapper->find($_POST['membershipID']);
+ $this->_helper->viewRenderer->setNoRender();
+ $membershipID = $this->_request->getParam('membershipID');
+ if(isset($membershipID)) {
+ $membership = $this->membershipMapper->find($membershipID);
if(isset($membership)) {
try {
$this->membershipMapper->delete($membership);
@@ -220,7 +237,7 @@ class dev_GroupController extends Zend_Controller_Action
echo "Message: " . $e->getMessage() . "<br/>";
return;
}
- echo "Chosen Person has been successfully removed from the chosen group. <br />";
+ $this->_redirect("/dev/group/edit/groupID/" . $membership->getGroupID());
}
}