summaryrefslogtreecommitdiffstats
path: root/application/views/scripts/event/index.phtml
diff options
context:
space:
mode:
Diffstat (limited to 'application/views/scripts/event/index.phtml')
-rwxr-xr-xapplication/views/scripts/event/index.phtml15
1 files changed, 8 insertions, 7 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index d4da032..bbf7db7 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -432,17 +432,18 @@ var dayClick = false;
});
});
- $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + event.start, function(checkoverlapeventsresult){
- var cell = document.getElementById("conflicts");
- cell.removeChild(cell.firstChild);
- $("#conflicts").append(checkoverlapeventsresult);
- alert(checkoverlapeventsresult.withrepeat + ' ' + checkoverlapeventsresult.withoutrepeat);
- if(checkoverlapeventsresult == -1) {
+ $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + event.start, function(data){
+ //var cell = document.getElementById("conflicts");
+ //cell.removeChild(cell.firstChild);
+ //$("#conflicts").append(data);
+ var returndata = jQuery.parseJSON(data);
+ //alert(returndata.withrepeat + ' ' + returndata.withoutrepeat);
+ /*if(checkoverlapeventsresult == -1) {
isDroppable = true;
overlapevents = null;
} else {
isDroppable = false;
- }
+ }*/
if(event.repeat == 0 && event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
$(function() {