From 91318534af71553b80b022f39e3657e22e37dfb9 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 26 Oct 2011 14:53:53 +0200 Subject: verschiedenes --- application/views/scripts/event/index.phtml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'application/views/scripts/event/index.phtml') diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index 9b23a55..7b8cfe7 100755 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -547,6 +547,9 @@ var dayClick = false; var cfcell = document.getElementById("cfevents"); // get conflicts var returndata = jQuery.parseJSON(data); + + // get past + var past = returndata.past; // get conflict free events with repeat var cfevents = returndata.cfevents; @@ -562,7 +565,7 @@ var dayClick = false; buttons: { "Drop Conflict-Free Events": function() { $(this).dialog("close"); - $.post("/event/eventmovecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfeventsString); + self.location="/event/eventmovecf/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val() + "/cfevents/" + cfeventsString; }, "OK": function() { $(this).dialog("close"); @@ -666,7 +669,7 @@ var dayClick = false; }, "Move all Events": function() { if(returndata.withrepeat == -1) { - if(event.start > currentDate) { + if(event.start > currentDate && !past) { $(this).dialog("close"); self.location="/event/eventmoveall/eventTitle/" + event.title + "/evmindelta/" + minuteDelta + "/evdaydelta/" + dayDelta + "/poolID/" + $("#poolselectbox option:selected").val(); } else { -- cgit v1.2.3-55-g7522