summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Wagner2011-10-25 19:38:49 +0200
committerSebastian Wagner2011-10-25 19:38:49 +0200
commitfbaf34d674dcd4a09fa5c89e7c0eb3587703ab66 (patch)
treead7eb89577892ba2b0ac9e5edf0853548b85dece
parentverschiedenes (diff)
downloadpoolctrl-fbaf34d674dcd4a09fa5c89e7c0eb3587703ab66.tar.gz
poolctrl-fbaf34d674dcd4a09fa5c89e7c0eb3587703ab66.tar.xz
poolctrl-fbaf34d674dcd4a09fa5c89e7c0eb3587703ab66.zip
bugfix
-rwxr-xr-xapplication/controllers/EventController.php4
-rwxr-xr-xapplication/views/scripts/event/index.phtml4
2 files changed, 4 insertions, 4 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index f7b9277..9c75295 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -852,8 +852,8 @@ class EventController extends Zend_Controller_Action
$cfeventswithoutrepeat[] = $e;
}
- $this->view->events = $events;
- $this->view->others = $others;
+ //$this->view->events = $events;
+ //$this->view->others = $others;
$this->view->overlapswithrepeat = $overlapswithrepeat;
$this->view->cfeventswithrepeat = $cfeventswithrepeat;
$this->view->overlapswithoutrepeat = $overlapswithoutrepeat;
diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml
index 489c6e4..a3ee114 100755
--- a/application/views/scripts/event/index.phtml
+++ b/application/views/scripts/event/index.phtml
@@ -107,7 +107,7 @@ var dayClick = false;
//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")) {
// check if the event is an wdhEvent
- if(selectedEvent.repeat == 0) {
+ if(selectedEvent.repeat == 0 || selectedEvent.repeat == 2) {
// dialog for deleting selected event
$(function() {
$( "#eventDeleteDialog" ).dialog({
@@ -135,7 +135,7 @@ var dayClick = false;
$( "#eventDeleteDialog" ).dialog('open');
// dialog for deleting selected wdhEvent
- } else {
+ } else if (selectedEvent.repeat == 1) {
$(function() {
$( "#eventDeleteWdhDialog" ).dialog({
autoOpen: false,