From 2a5b6d48870ee4a04ed1248b8c7cd0726e30cc57 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 24 Oct 2011 17:51:05 +0200 Subject: some bugfixes --- application/controllers/EventController.php | 7 ++++++- application/views/scripts/event/index.phtml | 8 ++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index b1c3ea5..9490f0e 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -1036,6 +1036,9 @@ class EventController extends Zend_Controller_Action $evdaydelta = $this->getRequest()->getParam('evdaydelta'); $poolID = $this->getRequest()->getParam('poolID'); + json_encode($cfevents); + print_r($cfevents); + $events = null; if($cfevents!=null) { @@ -1045,6 +1048,8 @@ class EventController extends Zend_Controller_Action } } + var_dump($events); + if ($events!=null) { /*if ($events[0]->getPbs_membershipID() != $this->userIDsNamespace['membershipID']) { @@ -1104,7 +1109,7 @@ class EventController extends Zend_Controller_Action } $this->_redirect('/event/'); } else { - $this->_redirect('/event/'); + //$this->_redirect('/event/'); return; } } diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index b85b17d..38ccf92 100755 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -383,11 +383,11 @@ var dayClick = false; // get conflicts-HTML Element var cell = document.getElementById("conflicts"); var cfcell = document.getElementById("cfevents"); - var cf_ = document.getElementById("cf_"); // get conflicts var returndata = jQuery.parseJSON(data); // get conflict free events var cfevents = returndata.cfevents; + //initialize eventNotDroppableDialog Dialog $(function() { @@ -397,7 +397,7 @@ var dayClick = false; modal: true, title: 'Resizing of ' + event.title + ' is not possible!', buttons: { - "Resolve Conflicts": function() { + "Resize Conflict-Free Events": function() { $(this).dialog("close"); self.location="/event/eventresizecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents; }, @@ -523,9 +523,9 @@ var dayClick = false; modal: true, title: 'Dropping of ' + event.title + ' is not possible!', buttons: { - "Resolve Conflicts": function() { + "Drop Conflict-Free Events": function() { $(this).dialog("close"); - $.post("/event/eventmovecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents); + self.location="/event/eventmovecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents; }, "OK": function() { $(this).dialog("close"); -- cgit v1.2.3-55-g7522