summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorsebastian wagner2011-09-14 17:18:08 +0200
committersebastian wagner2011-09-14 17:18:08 +0200
commitab7c12e88faa24dad254920ad701f71693e4d389 (patch)
tree7a15b888ad831db96d540e492c1472c9ae12dfcd /application
parentdeletewdh events (diff)
downloadpoolctrl-ab7c12e88faa24dad254920ad701f71693e4d389.tar.gz
poolctrl-ab7c12e88faa24dad254920ad701f71693e4d389.tar.xz
poolctrl-ab7c12e88faa24dad254920ad701f71693e4d389.zip
immediate check
Diffstat (limited to 'application')
-rwxr-xr-xapplication/controllers/EventController.php5
-rwxr-xr-xapplication/views/scripts/event/index.phtml4
2 files changed, 8 insertions, 1 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index bf6fa65..43e33a9 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -308,6 +308,10 @@ class EventController extends Zend_Controller_Action
} else {
$event = new Application_Model_Event();
$this->eventMapper->find($eventID, $event);
+ if($event->getImmediate()) {
+ $this->_redirect('/event/');
+ exit;
+ }
$eventcategorylist = $this->eventcategoryMapper->fetchAll();
$bootOsApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getbootoss'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', '');
$bootOsXMLString = $bootOsApiResult['http-body'];
@@ -624,6 +628,7 @@ class EventController extends Zend_Controller_Action
'selected' => false,
'repeat' => $event->getRepeat(),
'opacity' => 1,
+ 'immediate' => $event->getImmediate(),
)
);
}
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 525c854..4f18657 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -224,7 +224,9 @@ var poolIDtmp;
} else {
// this is the dblclick
$(this).qtip("destroy");
- self.location = "/event/edit/eventID/" + event.id + "/poolID/" + $("#poolselectbox option:selected").val();
+ if(event.immediate == 0) {
+ self.location = "/event/edit/eventID/" + event.id + "/poolID/" + $("#poolselectbox option:selected").val();
+ }
}
},