From 07849ce0f619cd80173ebb74e5e2f26355b4d539 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Mon, 17 Oct 2011 16:18:41 +0200 Subject: some changes --- application/views/scripts/event/checkoverlapevents.phtml | 4 +++- application/views/scripts/event/index.phtml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/application/views/scripts/event/checkoverlapevents.phtml b/application/views/scripts/event/checkoverlapevents.phtml index 30b433f..26b6274 100644 --- a/application/views/scripts/event/checkoverlapevents.phtml +++ b/application/views/scripts/event/checkoverlapevents.phtml @@ -6,9 +6,11 @@ if(count($this->overlaps) == 0) { echo '

no overlapping events

'; } else { + echo ''; // Echo contents of output, e.g. required values, such as title, date, etc. //echo json_encode($this->overlaps); } diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index f124986..3882ec9 100755 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -523,11 +523,11 @@ var dayClick = false; }, eventDragStop: function(event, jsEvent, ui, view, date) { - /* + /* //alert(date); overlapevents = $.get("/event/checkoverlapevents/eventID/" + event.id + "/date/" + date, function(checkoverlapeventsresult){ $("#conflicts").append(checkoverlapeventsresult);}); - if(overlapevents) { + if(overlapevents != '

no overlapping events

') { isDroppable = false; } else { isDroppable = true; -- cgit v1.2.3-55-g7522