summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-11-14 14:42:27 +0100
committerSebastian Wagner2011-11-14 14:42:27 +0100
commit659738f834b24a74317b059568427963d570b5de (patch)
treeccb539e8d50814631d8fb1774a220976fb516985
parenttest (diff)
downloadpoolctrl-659738f834b24a74317b059568427963d570b5de.tar.gz
poolctrl-659738f834b24a74317b059568427963d570b5de.tar.xz
poolctrl-659738f834b24a74317b059568427963d570b5de.zip
some clean up
-rwxr-xr-xapplication/forms/EventEdit.php4
-rwxr-xr-xapplication/views/scripts/event/index.phtml100
-rwxr-xr-xlibrary/Poolctrl/Acl.php8
3 files changed, 19 insertions, 93 deletions
diff --git a/application/forms/EventEdit.php b/application/forms/EventEdit.php
index c5809e0..d3cd830 100755
--- a/application/forms/EventEdit.php
+++ b/application/forms/EventEdit.php
@@ -132,18 +132,20 @@ class Application_Form_EventEdit extends Zend_Form
));
$this->getElement('title')->addPrefixPath('Poolctrl_Validate', 'Poolctrl/Validate/', 'validate');
- if(isset($this->params['force'])) {
+ if($this->params['force'] == 1) {
$this->addElement('checkbox', 'force', array(
'required' => false,
'label' => 'Force event:',
'value' => array(0,1),
'checked' => 'checked',
+ 'disable' => true,
));
} else {
$this->addElement('checkbox', 'force', array(
'required' => false,
'label' => 'Force event:',
'value' => array(0,1),
+ 'disable' => true,
));
}
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 4061092..fb487fa 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -1,4 +1,4 @@
-<h1>Events</h1>
+<h1>Pool Control</h1>
<div id='calendar'
style='margin: 3em 0; font-size: 13px'></div>
@@ -22,7 +22,6 @@ var selectedDate = null;
// dblclick
var clickTmp = true;
-var evClick = false;
// overlapping
var isDroppable;
@@ -32,9 +31,6 @@ var overlappEnd;
// poolSelectVal
var poolIDtmp;
-// dayClick
-var dayClick = false;
-
//change border color of an event
function eventSelected(event) {
if (eventColor.ev != null){
@@ -48,6 +44,7 @@ function eventSelected(event) {
eventColor.color = event.borderColor;
event.borderColor = 'black';
$('#calendar').fullCalendar("rerenderEvents");
+ // show report button
if($.get("/event/checkright/rightShortcut/er")){
$('#eventReportButton').show();
@@ -55,6 +52,7 @@ function eventSelected(event) {
$('#eventReportButton').hide();
}
+ // show edit button
if($.get("/event/checkright/rightShortcut/ee")) {
$('#editEvent').show();
} else {
@@ -109,9 +107,6 @@ function eventSelected(event) {
/*
* KEYDOWN FUNCTION
* delete selected event by key del(8) OR entf(46)
- * copy selected event by key ctrl(17) AND c(67)
- * cut selected event by key ctrl(17) AND x(88)
- * paste selected event by key ctrl(17) AND v(86)
*/
$(document).keydown(function (e) {
@@ -206,15 +201,6 @@ function eventSelected(event) {
defaultEventMinutes: 10,
loading: function(bool) { if (bool) $('#progress').show(); else $('#progress').hide(); },
-
-
- eventMouseover: function( event, jsEvent, view ) {
- evClick = true;
- },
-
- eventMouseout: function( event, jsEvent, view ) {
- evClick = false;
- },
eventClick: function( event, jsEvent, view ) {
@@ -223,8 +209,7 @@ function eventSelected(event) {
setTimeout(function() {clickTmp = true;} , 300);
$(this).qtip("destroy");
eventSelected(event);
- // non immediate event case
- } else if (event.immediate == 0 && $.get("/event/checkright/rightShortcut/ed")) {
+ } else if ($.get("/event/checkright/rightShortcut/ed")) {
// this is the dblclick
$(this).qtip("destroy");
if(event.repeat == 1) {
@@ -257,7 +242,7 @@ function eventSelected(event) {
} else self.location = "/event/edit/eventID/" + event.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
} else if (!$.get("/event/checkright/rightShortcut/ee")) {
$( "#errorRightsDialog" ).dialog('open');
- } else $( "#errorEditImmediate" ).dialog('open');
+ }
},
select: function( startDate, endDate, allDay, jsEvent, view ) {
@@ -295,7 +280,7 @@ function eventSelected(event) {
if($("#poolselectbox option:selected").val() == 'defaultPool' || $("#poolselectbox option:selected").val() == 'noPool') {
$( "#noPoolSelectedDialog" ).dialog('open');
- } else if (right && evClick == false) {
+ } else if (right) {
$(function() {
$( "#eventAddDialog" ).dialog({
autoOpen: false,
@@ -332,11 +317,10 @@ function eventSelected(event) {
});
});
$( "#eventAddDialog" ).dialog('open');
- } else if (!right && evClick == false) {
+ } else if (!right) {
$('#calendar').fullCalendar( 'unselect' );
$( "#errorRightsDialog" ).dialog('open');
} else
- evClick = true;
$('#calendar').fullCalendar( 'unselect' );
});
});
@@ -548,7 +532,7 @@ function eventSelected(event) {
});
});
- if((event.repeat == 0 || event.repeat == 2) && event.immediate == 0 && $.get("/event/checkright/rightShortcut/ee")) {
+ if((event.repeat == 0 || event.repeat == 2) && $.get("/event/checkright/rightShortcut/ee")) {
$(function() {
$( "#defaultDialog" ).dialog({
autoOpen: false,
@@ -583,7 +567,7 @@ function eventSelected(event) {
});
});
$( "#defaultDialog" ).dialog('open');
- } else if (event.repeat == 1 && event.immediate == 0 && $.get("/event/checkright/rightShortcut/ee")) {
+ } else if (event.repeat == 1 && $.get("/event/checkright/rightShortcut/ee")) {
$(function() {
$( "#eventMoveWdhDialog" ).dialog({
autoOpen: false,
@@ -638,26 +622,6 @@ function eventSelected(event) {
});
});
$( "#eventMoveWdhDialog" ).dialog('open');
- } else if (event.immediate == 1 && $.get("/event/checkright/rightShortcut/ee")){
- $(function() {
- $( "#eventImmediateButtonDialog" ).dialog({
- autoOpen: false,
- width: 600,
- modal: true,
- title: 'Move ' + event.title,
- buttons: {
- "OK": function() {
- $(this).dialog("close");
- revertFunc();
- }
- },
- open: function () {
- $(".ui-dialog-titlebar-close").hide();
- $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
- }
- });
- });
- $("#eventImmediateButtonDialog").dialog('open');
} else {
revertFunc();
$(this).qtip("destroy");
@@ -813,7 +777,7 @@ function eventSelected(event) {
$("#editEvent").click(function(){
if(selectedEvent != null) {
- if(selectedEvent.repeat == 1 && selectedEvent.immediate == 0) {
+ if(selectedEvent.repeat == 1) {
$(function() {
$( "#eventEditWdhDialog" ).dialog({
autoOpen: false,
@@ -840,10 +804,10 @@ function eventSelected(event) {
});
});
$( "#eventEditWdhDialog" ).dialog('open');
- } else if ( ( selectedEvent.repeat == 0 || selectedEvent.repeat == 2 ) && selectedEvent.immediate == 0) self.location = "/event/edit/eventID/" + selectedEvent.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
+ } else if ( selectedEvent.repeat == 0 || selectedEvent.repeat == 2 ) self.location = "/event/edit/eventID/" + selectedEvent.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
else if (!$.get("/event/checkright/rightShortcut/ee")) {
$( "#errorRightsDialog" ).dialog('open');
- } else $( "#errorEditImmediate" ).dialog('open');
+ }
}
});
@@ -922,25 +886,6 @@ function eventSelected(event) {
}
});
});
-
-// errorEditImmediate Dialog
- $(function() {
- $( "#errorEditImmediate" ).dialog({
- autoOpen: false,
- width: 600,
- modal: true,
- title: "ERROR",
- buttons: {
- "OK": function() {
- $(this).dialog("close");
- }
- },
- open: function () {
- $(".ui-dialog-titlebar-close").hide();
- $(this).parents(".ui-dialog:first").find(".ui-dialog-titlebar").addClass("ui-state-error");
- }
- });
- });
// errorTime Dialog
$(function() {
@@ -1027,22 +972,6 @@ selected one?</p>
<p>Please choose an Event first!</p>
</div>
-<!-- eventImmediateButton -->
-<div id="eventImmediateButtonDialog" style="display: none">
-<p>You can´t change time of an Immediate-Event!</p>
-<p>Please generate a new Event</p>
-</div>
-
-<!-- eventResize boot -->
-<div id="eventResizeBootDialog" style="display: none">
-<p>You can´t change the EndTime of a Boot Event!</p>
-</div>
-
-<!-- eventResize shutdown -->
-<div id="eventResizeShutdownDialog" style="display: none">
-<p>You can´t change the EndTime of a Shutdown Event!</p>
-</div>
-
<!-- eventNotDroppableDialog -->
<div id="eventNotDroppableDialog" style="display: none">
<p>You can´t drop this Event here! There exists at least one collision
@@ -1071,11 +1000,6 @@ between two events.</p>
<p>Please choose another position and try again.</p>
</div>
-<!-- errorEditImmediate -->
-<div id="errorEditImmediate" style="display: none">
-<p>You can´t edit an Immediate-Event!</p>
-</div>
-
<!-- errorRights -->
<div id="errorRightsDialog" style="display: none">
<p>Permission denied!</p>
diff --git a/library/Poolctrl/Acl.php b/library/Poolctrl/Acl.php
index 6cd7a87..5b4609c 100755
--- a/library/Poolctrl/Acl.php
+++ b/library/Poolctrl/Acl.php
@@ -24,7 +24,7 @@ class Poolctrl_Acl
public function checkRight($rightShortcut) {
if(!isset($this->host) || !isset($this->path) || !isset($this->referer)) {
- return 0;
+ return false;
}
$dataToSend = "rightshortcut=" . $rightShortcut;
@@ -56,12 +56,12 @@ class Poolctrl_Acl
$success = $checkRightXML->checkright->success;
if($success == "true") {
- return 1;
+ return true;
} else {
- return 0;
+ return false;
}
} else {
- return 0;
+ return false;
}
}