From 919b0ac369477c1c34c7e532ceabbd6f4f326e93 Mon Sep 17 00:00:00 2001 From: sebastian wagner Date: Tue, 18 Oct 2011 14:07:09 +0200 Subject: minor --- application/views/scripts/event/index.phtml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index bbf7db7..b0d4ab4 100755 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -209,8 +209,8 @@ var dayClick = false; defaultEventMinutes: 10, dayClick: function( date, allDay, jsEvent, view ) { - console.log(date); - alert(date); + //console.log(date); + //alert(date); /* selectedDate = date; dayClick = true; @@ -433,8 +433,8 @@ var dayClick = false; }); $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + event.start, function(data){ - //var cell = document.getElementById("conflicts"); - //cell.removeChild(cell.firstChild); + var cell = document.getElementById("conflicts"); + cell.removeChild(cell.firstChild); //$("#conflicts").append(data); var returndata = jQuery.parseJSON(data); //alert(returndata.withrepeat + ' ' + returndata.withoutrepeat); @@ -458,7 +458,7 @@ var dayClick = false; revertFunc(); }, "OK": function() { - if(isDroppable) { + if(returndata.withoutrepeat == -1) { $(this).dialog("close"); $.post("/event/eventmove/evid/" + event.id + "/evstart/" + event.start + "/evend/" + event.end); } else { -- cgit v1.2.3-55-g7522