summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers/FilterController.php
diff options
context:
space:
mode:
authorSimon2011-03-19 20:50:50 +0100
committerSimon2011-03-19 20:50:50 +0100
commit8b7d22a01d141e437312c81b208942f749bc3e62 (patch)
tree30759cc7d0052e38749a2fb6c6553dfbea05234f /application/modules/user/controllers/FilterController.php
parentFilterentry Formular geändert, selectboxen für Client, Membership etc fehle... (diff)
downloadpbs2-8b7d22a01d141e437312c81b208942f749bc3e62.tar.gz
pbs2-8b7d22a01d141e437312c81b208942f749bc3e62.tar.xz
pbs2-8b7d22a01d141e437312c81b208942f749bc3e62.zip
Selectboxen in Filterentry, Gruppen-Selectbox fehlt noch
Diffstat (limited to 'application/modules/user/controllers/FilterController.php')
-rw-r--r--application/modules/user/controllers/FilterController.php61
1 files changed, 48 insertions, 13 deletions
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index a94d5b3..88c7668 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -174,6 +174,30 @@ class User_FilterController extends Zend_Controller_Action
}
}
}
+
+ private function prepareFormData(){
+ $poolMapper = new Application_Model_PoolMapper();
+ $pools = $poolMapper->findBY('groupID',$this->membership->getGroupID());
+
+ $bootisoMapper = new Application_Model_BootIsoMapper();
+ $bootisos = $bootisoMapper->findBY('groupID',$this->membership->getGroupID());
+
+ $membershipMapper = new Application_Model_MembershipMapper();
+ $memberships = $membershipMapper->findBY('groupID',$this->membership->getGroupID());
+
+ // TODO: get all child groups
+ $grouppMapper = new Application_Model_GroupMapper();
+ $groups = $grouppMapper->findBY('groupID',$this->membership->getGroupID());
+
+ $clientMapper = new Application_Model_ClientMapper();
+ $clients = $clientMapper->findBY('groupID',$this->membership->getGroupID());
+
+ return array ( 'clients' => $clients,
+ 'memberships' => $memberships,
+ 'bootisos' => $bootisos,
+ 'pools' => $pools);
+
+ }
public function addfilterentryAction()
{
@@ -183,14 +207,16 @@ class User_FilterController extends Zend_Controller_Action
$filter = new Application_Model_Filter();
$filterMapper->find($filterID,$filter);
+ $selectData = $this->prepareFormData();
+
if($filter->getGroupID() == $this->membership->getGroupID()){
if (!isset($_POST["add"])){
try{
- $addform = new user_Form_FilterEntry(
- array( 'buttontext' => 'Add Filterentry',
- 'filterID' => $filterID,
- 'data' => $_POST
- ));
+ $addform = new user_Form_FilterEntry(array( 'buttontext' => 'Add Filterentry',
+ 'filterID' => $filterID,
+ 'selectData' => $selectData,
+ 'data' => $_POST
+ ));
$addform->populate($_POST);
$this->view->addform = $addform;
}catch (Zend_Exception $e) {
@@ -198,7 +224,10 @@ class User_FilterController extends Zend_Controller_Action
$this->_redirect('/user/filter/index/addresult/error');
}
} else{
- $addform = new user_Form_FilterEntry(array('buttontext' => 'Add Filterentry', 'data'=>$_POST));
+ $addform = new user_Form_FilterEntry(array('buttontext' => 'Add Filterentry',
+ 'selectData' => $selectData,
+ 'data'=>$_POST
+ ));
if ($addform->isValid($_POST)) {
print_a('valid');
$newfilterenty = new Application_Model_FilterEntries();
@@ -215,12 +244,14 @@ class User_FilterController extends Zend_Controller_Action
}
else{
$newfilterenty->setFiltervalue($_POST['filtervalue']);
- $newfilterenty->setFiltervalue2($_POST['filtervalue2']);
+ if(isset($_POST['filtervalue2'])){
+ $newfilterenty->setFiltervalue2($_POST['filtervalue2']);
+ }
}
$newfilter2 = new Application_Model_FilterEntriesMapper();
$newfilter2->save($newfilterenty);
- #$this->_redirect('/user/filter/index/addresult/ok');
+ $this->_redirect('/user/filter/index/addresult/ok');
}
$this->view->addform = $addform;
}
@@ -233,6 +264,7 @@ class User_FilterController extends Zend_Controller_Action
public function editfilterentryAction()
{
//TODO: ACL: is he allowed to edit filterentrys ?
+ $selectData = $this->prepareFormData();
if (!isset($_POST["add"])){
try{
$filterentriesID = $this->_request->getParam('filterentriesID');
@@ -249,9 +281,10 @@ class User_FilterController extends Zend_Controller_Action
$filterentry->setFiltertypeID($_POST['filtertypeID']) ;
}
$data = $filterentry->toArray();
- $editfilterform = new user_Form_FilterEntry(
- array('buttontext' => 'Edit Filterentry',
- 'data' => $data));
+ $editfilterform = new user_Form_FilterEntry(array('buttontext' => 'Edit Filterentry',
+ 'selectData' => $selectData,
+ 'data' => $data
+ ));
$editfilterform->populate($filterentry->toArray());
$this->view->editfilterform = $editfilterform;
@@ -266,7 +299,10 @@ class User_FilterController extends Zend_Controller_Action
} else{
try{
$filterentriesID = $this->_request->getParam('filterentriesID');
- $editfilterform = new user_Form_FilterEntry(array('buttontext' => 'Edit Filterentry','data' => $_POST),$_POST);
+ $editfilterform = new user_Form_FilterEntry(array('buttontext' => 'Edit Filterentry',
+ 'selectData' => $selectData,
+ 'data' => $_POST
+ ));
if ($editfilterform->isValid($_POST)) {
$filterentry = new Application_Model_FilterEntries();
$filterentriesmapper = new Application_Model_FilterEntriesMapper();
@@ -297,7 +333,6 @@ class User_FilterController extends Zend_Controller_Action
// check if it's the last groupID filterentry
$allFilters = $filterentriesmapper->findBy('filterID',$filterentry->getFilterID());
- #print_a($allFilters);
$lastfilter = true;
foreach($allFilters as $thisFilterentry){
if($thisFilterentry['filtertypeID'] == 6 && $thisFilterentry['filterentriesID'] != $filterentriesID){