summaryrefslogtreecommitdiffstats
path: root/application/views
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-24 17:01:20 +0200
committerSebastian Wagner2011-10-24 17:01:20 +0200
commit0ac4cd4d2a7af3eb900c646de7beb71af92310a0 (patch)
tree91bfd10a849b38bff4358ec09aec87d704e462de /application/views
parentadd pause.png (diff)
downloadpoolctrl-0ac4cd4d2a7af3eb900c646de7beb71af92310a0.tar.gz
poolctrl-0ac4cd4d2a7af3eb900c646de7beb71af92310a0.tar.xz
poolctrl-0ac4cd4d2a7af3eb900c646de7beb71af92310a0.zip
some changes
Diffstat (limited to 'application/views')
-rwxr-xr-xapplication/views/scripts/event/index.phtml5
1 files changed, 2 insertions, 3 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 61e23e9..b85b17d 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -383,6 +383,7 @@ 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
@@ -398,7 +399,7 @@ var dayClick = false;
buttons: {
"Resolve Conflicts": function() {
$(this).dialog("close");
- self.location="/event/eventmovecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents;
+ self.location="/event/eventresizecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfevents;
},
"OK": function() {
$(this).dialog("close");
@@ -590,8 +591,6 @@ var dayClick = false;
} else {
$(this).dialog("close");
cell.removeChild(cell.firstChild);
- cfcell.removeChild(cfcell.firstChild);
- $("#cfevents").append(returndata.cfplotwithoutrepeat);
$("#conflicts").append(returndata.withoutrepeat);
$( "#eventNotDroppableDialog" ).dialog('open');
}