summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xapplication/controllers/EventController.php28
-rwxr-xr-xapplication/forms/EventEdit.php5
2 files changed, 26 insertions, 7 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index dfe8b78..752706a 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -576,6 +576,9 @@ class EventController extends Zend_Controller_Action
}
$this->getRequest()->setParam('participants', $event->getParticipants());
$this->getRequest()->setParam('category', $event->getCategory());
+ $eventCategory = new Application_Model_Eventcategory();
+ $this->eventcategoryMapper->find($event->getCategory(), $eventCategory);
+ $this->getRequest()->setParam('categoryLabel', $eventCategory->getTitle());
$this->getRequest()->setParam('note', $event->getNote());
$this->getRequest()->setParam('pbs_poolID', $event->getPbs_poolID());
$this->getRequest()->setParam('pbs_bootosID', $event->getPbs_bootosID());
@@ -664,9 +667,18 @@ class EventController extends Zend_Controller_Action
$eventID = $this->getRequest()->getParam('eventID');
$date = intval(strtotime(substr($this->getRequest()->getParam('date'), 0, 24)));
+
$events['withrepeat'] = $this->eventMapper->getDraggingEvents($eventID);
$events['withoutrepeat'] = $this->eventMapper->getDraggingEvent($eventID);
+
+
+ if($repeat) {
+ $events = $this->eventMapper->getDraggingEvents($eventID);
+ } else {
+ $events = $this->eventMapper->getDraggingEvent($eventID);
+ }
+
$others = $this->eventMapper->getNotDraggingEvents($eventID);
// Calculate time shift
@@ -750,7 +762,7 @@ class EventController extends Zend_Controller_Action
}
$result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
$shutdownCategory = $result[0];
- if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ if($event->getCategory() != $shutdownCategory->getID()) {
if($event->getPbs_filterID()) {
if(!$oldEvent->getRepeat()) {
$filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "filterid=" . $oldEvent->getPbs_filterID());
@@ -791,7 +803,13 @@ class EventController extends Zend_Controller_Action
$filterentriesID3 = sprintf("%s", $filterentriesXML3->filterentry->id);
}
}
- $this->eventMapper->save($event); //save the event with the new data
+ try {
+ $this->eventMapper->save($event); //save the event with the new data
+ } catch (Zend_Exception $e) {
+ echo "Caught exception: " . get_class($e) . "<br/>";
+ echo "Message: " . $e->getMessage() . "<br/>";
+ return;
+ }
}
}
@@ -839,7 +857,7 @@ class EventController extends Zend_Controller_Action
$event->setPbs_poolID($poolID);
$result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
$shutdownCategory = $result[0];
- if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ if($event->getCategory() != $shutdownCategory->getID()) {
if($event->getPbs_filterID()) {
if($event->getRepeat()) {
$repeattypeMapper = new Application_Model_RepeattypeMapper();
@@ -904,7 +922,7 @@ class EventController extends Zend_Controller_Action
$event->setPbs_poolID($poolID);
$result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
$shutdownCategory = $result[0];
- if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ if($event->getCategory() != $shutdownCategory->getID()) {
if($event->getPbs_filterID()) {
if(!$oldEvent->getRepeat()) {
$filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "filterid=" . $oldEvent->getPbs_filterID());
@@ -977,7 +995,7 @@ class EventController extends Zend_Controller_Action
$event->setPbs_poolID($poolID);
$result = $this->eventcategoryMapper->findBy(array('title' => 'Shutdown'));
$shutdownCategory = $result[0];
- if($newEvent->getCategory() != $shutdownCategory->getID()) {
+ if($event->getCategory() != $shutdownCategory->getID()) {
if($event->getPbs_filterID()) {
$filterentriesQuerie = "filterid=" . $event->getPbs_filterID() . "&oldvalue1=" . $oldStartTime . "&oldvalue2=" . $oldEndTime . "&value1=" . $newStartTime . "&value2=" . $newEndTime;
$filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['changefilterentry'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', $filterentriesQuerie);
diff --git a/application/forms/EventEdit.php b/application/forms/EventEdit.php
index c223527..6866dd2 100755
--- a/application/forms/EventEdit.php
+++ b/application/forms/EventEdit.php
@@ -113,6 +113,7 @@ class Application_Form_EventEdit extends Zend_Form
$eventcategoryfield->setRegisterInArrayValidator(false);
$eventcategoryfield->setValue($this->params['category']);
+ $eventcategoryfield->setAttrib("disabled", true);
$eventcategoryfield->setAttrib('onchange', "editeventcategoryfieldChanged('category');");
$this->addElement($eventcategoryfield);
@@ -138,7 +139,7 @@ class Application_Form_EventEdit extends Zend_Form
'label' => 'Start:',
'value' => date ('m/d/Y h:i a', strtotime( $this->params['start'])),
));
-
+
if(isset($this->params['end'])) {
$this->addElement('text', 'end', array(
'filters' => array('StringTrim'),
@@ -152,7 +153,7 @@ class Application_Form_EventEdit extends Zend_Form
'value' => date ('m/d/Y h:i a', strtotime( $this->params['end'])),
));
$this->getElement('end')->addPrefixPath('Poolctrl_Validate', 'Poolctrl/Validator/', 'validate');
- } else {
+ } else if($this->params['categoryLabel'] != "Boot" && $this->params['categoryLabel'] != "Shutdown") {
$this->addElement('text', 'end', array(
'filters' => array('StringTrim'),
'validators' => array(