summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorSebastian Wagner2011-09-28 11:55:51 +0200
committerSebastian Wagner2011-09-28 11:55:51 +0200
commit00e68440b0daae4e46c4066b4d36c1c95b7e0369 (patch)
treecc433f302f22a03970b17baa64b2804571b8d99d /application
parentbugfix (diff)
downloadpoolctrl-00e68440b0daae4e46c4066b4d36c1c95b7e0369.tar.gz
poolctrl-00e68440b0daae4e46c4066b4d36c1c95b7e0369.tar.xz
poolctrl-00e68440b0daae4e46c4066b4d36c1c95b7e0369.zip
bugfix
Diffstat (limited to 'application')
-rwxr-xr-xapplication/views/scripts/event/index.phtml28
1 files changed, 16 insertions, 12 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index ac65244..7f1881f 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -21,6 +21,7 @@ var selectedDate = null;
// dblclick
var clickTmp = true;
+var evClick = false;
// overlapping
var isDroppable = true;
@@ -207,10 +208,11 @@ var dayClick = false;
selectedDate = date;
dayClick = true;
+ $('#calendar').fullCalendar( 'unselect' );
if($("#poolselectbox option:selected").val() == 'default') {
$( "#noPoolSelectedDialog" ).dialog('open');
- } else if ($.get("/event/checkright/rightShortcut/ec")) {
+ } else if ($.get("/event/checkright/rightShortcut/ec") && evClick == false) {
$(function() {
$( "#eventAddDialog" ).dialog({
autoOpen: false,
@@ -235,16 +237,17 @@ var dayClick = false;
});
});
$( "#eventAddDialog" ).dialog('open');
- } else {
+ } else if (evClick == false) {
dayClick = false;
$('#calendar').fullCalendar( 'unselect' );
$( "#errorRightsDialog" ).dialog('open');
}
+ else $('#calendar').fullCalendar( 'unselect' );
},
eventMouseover: function( event, jsEvent, view ) {
- overlappStart = event.start;
- overlppEnd = event.end;
+ //overlappStart = event.start;
+ //overlppEnd = event.end;
},
eventMouseout: function( event, jsEvent, view ) {
@@ -252,19 +255,20 @@ var dayClick = false;
eventClick: function( event, jsEvent, view ) {
+ $('#calendar').fullCalendar( 'unselect' );
+ evClick = true;
+
if(clickTmp) {
clickTmp = false;
setTimeout(function() {clickTmp = true;} , 300);
+ setTimeout(function() {evClick = false;} , 300);
$(this).qtip("destroy");
eventSelected(event);
- } else {
- // this is the dblclick
- $(this).qtip("destroy");
- if(event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
- self.location = "/event/edit/eventID/" + event.id + "/poolID/" + $("#poolselectbox option:selected").val();
- } else if (event.immediate == 0) {
- $( "#errorRightsDialog" ).dialog('open');
- }
+ // non immediate event case
+ } else if (event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
+ // this is the dblclick
+ $(this).qtip("destroy");
+ self.location = "/event/edit/eventID/" + event.id + "/poolID/" + $("#poolselectbox option:selected").val();
}
},