summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-24 17:51:05 +0200
committerSebastian Wagner2011-10-24 17:51:05 +0200
commit2a5b6d48870ee4a04ed1248b8c7cd0726e30cc57 (patch)
tree84041e66d761e21a5db6af924e594d0a573fcff5
parentsome changes (diff)
downloadpoolctrl-2a5b6d48870ee4a04ed1248b8c7cd0726e30cc57.tar.gz
poolctrl-2a5b6d48870ee4a04ed1248b8c7cd0726e30cc57.tar.xz
poolctrl-2a5b6d48870ee4a04ed1248b8c7cd0726e30cc57.zip
some bugfixes
-rwxr-xr-xapplication/controllers/EventController.php7
-rwxr-xr-xapplication/views/scripts/event/index.phtml8
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");