summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xapplication/controllers/EventController.php8
-rwxr-xr-xapplication/forms/EventAdd.php18
2 files changed, 13 insertions, 13 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index 0cfa282..7256335 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -144,15 +144,15 @@ class EventController extends Zend_Controller_Action
}
}
if(isset($this->userIDsNamespace['poolID'])) {
- $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'start' => $start, 'end' => $end, 'defaultEventCategoryID' => $defaultEventCategoryID, 'poolID' => $this->userIDsNamespace['poolID']));
+ $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'start' => $start, 'end' => $end, 'defaultEventCategoryID' => $defaultEventCategoryID, 'poolID' => $this->userIDsNamespace['poolID']));
} else {
$addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'start' => $start, 'end' => $end, 'defaultEventCategoryID' => $defaultEventCategoryID));
}
} else {
- $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'poollist' => $poollist, 'start' => $start, 'end' => $end, $this->getRequest()->getParams()));
+ $addForm = new Application_Form_EventAdd(array('eventcategorylist' => $eventcategorylist, 'bootoslist' => $bootoslist, 'start' => $start, 'end' => $end, $this->getRequest()->getParams()));
$params = $this->getRequest()->getParams();
- if(!isset($params['poolID'])) {
- $params['poolID'] = $this->userIDsNamespace['poolID'];
+ if(!isset($params['pbs_poolID'])) {
+ $params['pbs_poolID'] = $this->userIDsNamespace['poolID'];
}
if ($addForm->isValid($params)) {
if($params['immediate']) {
diff --git a/application/forms/EventAdd.php b/application/forms/EventAdd.php
index fce7566..e7f0465 100755
--- a/application/forms/EventAdd.php
+++ b/application/forms/EventAdd.php
@@ -226,20 +226,20 @@ class Application_Form_EventAdd extends Zend_Form
$poolfield->setRegisterInArrayValidator(false);
$this->addElement($poolfield);
+ }
- $bootosfield = $this->createElement('select','pbs_bootosID');
- $bootosfield ->setLabel('BootOS:');
+ $bootosfield = $this->createElement('select','pbs_bootosID');
+ $bootosfield ->setLabel('BootOS:');
- if(count($this->bootoslist)>0){
- foreach($this->bootoslist as $bootos => $b){
- $bootosfield->addMultiOption($b->getID(), $b->getTitle());
- }
+ if(count($this->bootoslist)>0){
+ foreach($this->bootoslist as $bootos => $b){
+ $bootosfield->addMultiOption($b->getID(), $b->getTitle());
}
-
- $bootosfield->setRegisterInArrayValidator(false);
- $this->addElement($bootosfield);
}
+ $bootosfield->setRegisterInArrayValidator(false);
+ $this->addElement($bootosfield);
+
$this->addElement('submit', 'add', array(
'required' => false,
'ignore' => true,