summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-10-28 12:34:22 +0200
committerBjörn Geiger2011-10-28 12:34:22 +0200
commitbe624c476d78dae6de52d27df3e0c2b5942f91fe (patch)
treee66f2e60a51238a82b61625c076bca0316fbb3c0
parentweitere Korrektur (diff)
downloadpoolctrl-be624c476d78dae6de52d27df3e0c2b5942f91fe.tar.gz
poolctrl-be624c476d78dae6de52d27df3e0c2b5942f91fe.tar.xz
poolctrl-be624c476d78dae6de52d27df3e0c2b5942f91fe.zip
minor
-rwxr-xr-xapplication/controllers/EventController.php14
-rwxr-xr-xapplication/views/scripts/event/index.phtml38
2 files changed, 31 insertions, 21 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index f7754c8..b7fd5ab 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -716,7 +716,9 @@ class EventController extends Zend_Controller_Action
*/
public function getpoollistAction() {
-
+ if(!$this->acl->checkRight('eo')) {
+ $this->_redirect('/');
+ }
$this->_helper->layout->disableLayout();
$poollist = array();
$poolApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getpools'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', '');
@@ -768,11 +770,11 @@ class EventController extends Zend_Controller_Action
foreach($events['withrepeat'] as $e) {
- $evstartTime = intval(strtotime($e['start'])) + $diff;
- if($e['running'] == 0 && $e['repeat'] == 1 && $evstartTime < time()) {
- $this->view->past = true;
- }
-
+ $evstartTime = intval(strtotime($e['start'])) + $diff;
+ if($e['running'] == 0 && $e['repeat'] == 1 && $evstartTime < time()) {
+ $this->view->past = true;
+ }
+
$enewstart = date('Y-m-d H:i:s', strtotime($e['start']) + $diff);
$summertimeStart = intval(date('I', strtotime($e['start'])));
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 7056e80..4443730 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -51,11 +51,16 @@ var dayClick = false;
$('#calendar').fullCalendar("rerenderEvents");
if($.get("/event/checkright/rightShortcut/er")){
$('#eventReportButton').show();
- $('#editEvent').show();
+
} else {
$('#eventReportButton').hide();
+
+ }
+ if($.get("/event/checkright/rightShortcut/ee")) {
+ $('#editEvent').show();
+ } else {
$('#editEvent').hide();
- }
+ }
}
// change view to addEvent
@@ -112,7 +117,7 @@ var dayClick = false;
$(document).keydown(function (e) {
//delete selected event by key del(8) OR entf(46)
- if (e.keyCode == 8 || e.keyCode == 46 && selectedEvent.selected == true, $.get("/event/checkright/rightShortcut/er")) {
+ if (e.keyCode == 8 || e.keyCode == 46 && selectedEvent.selected == true, $.get("/event/checkright/rightShortcut/ed")) {
// check if the event is an wdhEvent
if(selectedEvent.repeat == 0 || selectedEvent.repeat == 2) {
// dialog for deleting selected event
@@ -278,7 +283,7 @@ var dayClick = false;
$(this).qtip("destroy");
eventSelected(event);
// non immediate event case
- } else if (event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
+ } else if (event.immediate == 0 && $.get("/event/checkright/rightShortcut/ed")) {
// this is the dblclick
$(this).qtip("destroy");
if(event.repeat == 1) {
@@ -309,7 +314,7 @@ var dayClick = false;
});
$( "#eventEditWdhDialog" ).dialog('open');
} else self.location = "/event/edit/eventID/" + event.id + "/wdh/" + 0 + "/poolID/" + $("#poolselectbox option:selected").val();
- } else if (!$.get("/event/checkright/rightShortcut/er")) {
+ } else if (!$.get("/event/checkright/rightShortcut/ee")) {
$( "#errorRightsDialog" ).dialog('open');
} else $( "#errorEditImmediate" ).dialog('open');
},
@@ -453,7 +458,7 @@ var dayClick = false;
});
});
- if($.get("/event/checkright/rightShortcut/er")) {
+ if($.get("/event/checkright/rightShortcut/ee")) {
if(event.repeat == 0 || event.repeat == 2) {
$(function() {
$( "#defaultDialog" ).dialog({
@@ -600,7 +605,7 @@ var dayClick = false;
});
});
- if((event.repeat == 0 || event.repeat == 2) && event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
+ if((event.repeat == 0 || event.repeat == 2) && event.immediate == 0 && $.get("/event/checkright/rightShortcut/ee")) {
$(function() {
$( "#defaultDialog" ).dialog({
autoOpen: false,
@@ -635,7 +640,7 @@ var dayClick = false;
});
});
$( "#defaultDialog" ).dialog('open');
- } else if (event.repeat == 1 && event.immediate == 0 && $.get("/event/checkright/rightShortcut/er")) {
+ } else if (event.repeat == 1 && event.immediate == 0 && $.get("/event/checkright/rightShortcut/ee")) {
$(function() {
$( "#eventMoveWdhDialog" ).dialog({
autoOpen: false,
@@ -690,7 +695,7 @@ var dayClick = false;
});
});
$( "#eventMoveWdhDialog" ).dialog('open');
- } else if (event.immediate == 1 && $.get("/event/checkright/rightShortcut/er")){
+ } else if (event.immediate == 1 && $.get("/event/checkright/rightShortcut/ee")){
$(function() {
$( "#eventImmediateButtonDialog" ).dialog({
autoOpen: false,
@@ -718,7 +723,7 @@ var dayClick = false;
},
eventDragStart: function( event, jsEvent, ui, view ) {
- if(!$.get("/event/checkright/rightShortcut/er")) {
+ if(!$.get("/event/checkright/rightShortcut/ee")) {
$( "#errorRightsDialog" ).dialog('open');
}
},
@@ -888,7 +893,7 @@ var dayClick = false;
});
$( "#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 (!$.get("/event/checkright/rightShortcut/er")) {
+ else if (!$.get("/event/checkright/rightShortcut/ee")) {
$( "#errorRightsDialog" ).dialog('open');
} else $( "#errorEditImmediate" ).dialog('open');
}
@@ -1093,9 +1098,11 @@ between two events.</p>
<p>Please choose another position</p>
<div id="accordion">
<h3><a href="#">Show conflicts</a></h3>
-<div id="conflicts"><br ></div>
+<div id="conflicts"><br>
+</div>
<h3><a href="#">Show conflict-free Events</a></h3>
-<div id="cfevents"><br ></div>
+<div id="cfevents"><br>
+</div>
</div>
</div>
@@ -1124,7 +1131,7 @@ between two events.</p>
<!-- errorTime -->
<div id="errorTimeDialog" style="display: none">
-<p>One or more Events have been droped in the past.</p>
+<p>One or more Events have been droped in the past.</p>
<p>Please select a date in the future!</p>
</div>
@@ -1139,4 +1146,5 @@ between two events.</p>
</div>
<!-- add loading image -->
-<IMG id="progress" class="fc-progress" src="/media/img/loader.gif" />
+<IMG
+ id="progress" class="fc-progress" src="/media/img/loader.gif" />