From fbaf34d674dcd4a09fa5c89e7c0eb3587703ab66 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 25 Oct 2011 19:38:49 +0200 Subject: bugfix --- application/controllers/EventController.php | 4 ++-- application/views/scripts/event/index.phtml | 4 ++-- 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, -- cgit v1.2.3-55-g7522