summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-27 09:47:01 +0200
committerBjörn Geiger2011-10-27 09:47:01 +0200
commitd9189ff4e4ed8f55b84f2cadac439bccaa14851b (patch)
tree3c84c1e51d23e221e85f7864ed83fb2099f6c474
parentGearmanController gelöscht (diff)
parentbugfix (diff)
downloadpoolctrl-d9189ff4e4ed8f55b84f2cadac439bccaa14851b.tar.gz
poolctrl-d9189ff4e4ed8f55b84f2cadac439bccaa14851b.tar.xz
poolctrl-d9189ff4e4ed8f55b84f2cadac439bccaa14851b.zip
Merge branch 'master' of git.openslx.org:lsfks/projekte/poolctrl
-rwxr-xr-xapplication/views/scripts/event/index.phtml12
1 files changed, 6 insertions, 6 deletions
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 9e75fbe..2741421 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -60,7 +60,7 @@ var dayClick = false;
// change view to addEvent
function addEvent() {
- if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || $("#poolselectbox option:selected").val() == 'noPool') {
$("#noPoolSelectedDialog").dialog('open');
} else {
self.location="/event/add/";}
@@ -340,7 +340,7 @@ var dayClick = false;
// get conflicts
var returndata = jQuery.parseJSON(data);
- if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || $("#poolselectbox option:selected").val() == 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else if ($.get("/event/checkright/rightShortcut/ec") && evClick == false) {
$(function() {
@@ -808,7 +808,7 @@ var dayClick = false;
// Change Button-Style
$("#lecture").click(function(){
- if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || $("#poolselectbox option:selected").val() == 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {
@@ -818,7 +818,7 @@ var dayClick = false;
}
});
$("#maintenance").click(function(){
- if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || $("#poolselectbox option:selected").val() == 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {
@@ -828,7 +828,7 @@ var dayClick = false;
}
});
$("#boot").click(function(){
- if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || $("#poolselectbox option:selected").val() == 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {
@@ -838,7 +838,7 @@ var dayClick = false;
}
});
$("#shutdown").click(function(){
- if($("#poolselectbox option:selected").val() == 'defaultPool' || 'noPool') {
+ if($("#poolselectbox option:selected").val() == 'defaultPool' || $("#poolselectbox option:selected").val() == 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
} else {
if($(this).hasClass("fc-state-active")) {