summaryrefslogtreecommitdiffstats
path: root/application/views/scripts/event/index.phtml
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-14 17:58:15 +0200
committerBjörn Geiger2011-09-14 17:58:15 +0200
commit52a64fc76360b8e0a8eac20b44a24bb5b00b9d73 (patch)
tree07aa4dff57c3dfc74da5abc20d8a0aff2999a773 /application/views/scripts/event/index.phtml
parentrepeat Felder ein und ausblenden (diff)
parentimmediate check (diff)
downloadpoolctrl-52a64fc76360b8e0a8eac20b44a24bb5b00b9d73.tar.gz
poolctrl-52a64fc76360b8e0a8eac20b44a24bb5b00b9d73.tar.xz
poolctrl-52a64fc76360b8e0a8eac20b44a24bb5b00b9d73.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
Diffstat (limited to 'application/views/scripts/event/index.phtml')
-rwxr-xr-xapplication/views/scripts/event/index.phtml15
1 files changed, 10 insertions, 5 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 525c854..4645109 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -224,7 +224,9 @@ var poolIDtmp;
} else {
// this is the dblclick
$(this).qtip("destroy");
- self.location = "/event/edit/eventID/" + event.id + "/poolID/" + $("#poolselectbox option:selected").val();
+ if(event.immediate == 0) {
+ self.location = "/event/edit/eventID/" + event.id + "/poolID/" + $("#poolselectbox option:selected").val();
+ }
}
},
@@ -332,12 +334,12 @@ var poolIDtmp;
});
});
$( "#defaultDialog" ).dialog('open');
+ $(this).qtip("destroy");
},
eventDrop: function( event, dayDelta, minuteDelta, allDay, revertFunc ) {
if(event.repeat == 0 && isDroppable) {
-
$(function() {
$( "#defaultDialog" ).dialog({
autoOpen: false,
@@ -390,9 +392,9 @@ var poolIDtmp;
});
$( "#eventMoveWdhDialog" ).dialog('open');
} else revertFunc();
-
+ $(this).qtip("destroy");
},
-
+
eventDragStop: function(event, jsEvent, ui, view) {
/*
if() {
@@ -406,10 +408,13 @@ var poolIDtmp;
// disable resizing if the event is a boot- or shutdown-event
if(event.category == 'Boot' || event.category == 'Shutdown') {
-
element.resizable(false); // calendar resizing
element.resizable("destroy"); // jqeury resizing
element.removeClass('fc-event-vert'); // css class
+ }
+
+ if(event.immediate == 1) {
+ element.draggable = false;
}
/*