From 78090f3a461c819a1d24b2494a7e30d241833b01 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Thu, 27 Oct 2011 10:46:55 +0200 Subject: bugfix --- application/controllers/EventController.php | 4 ++-- application/views/scripts/event/index.phtml | 31 +++++++++++++++++++++++++++++ public/media/js/script.js | 11 ++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php index 0cb4954..a236817 100755 --- a/application/controllers/EventController.php +++ b/application/controllers/EventController.php @@ -324,10 +324,10 @@ class EventController extends Zend_Controller_Action $this->_redirect('/'); } } - if($event->getPbs_bootmenuID()) { + if($event->getPbs_bootmenuID() && $event->getRepeat() == 0) { $bootmenuApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletebootmenu'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "bootmenuid=" . $event->getPbs_bootmenuID()); } - if($event->getPbs_filterID()) { + if($event->getPbs_filterID() && $event->getRepeat() != 1) { $filterApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['deletefilter'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', "filterid=" . $event->getPbs_filterID()); } try { diff --git a/application/views/scripts/event/index.phtml b/application/views/scripts/event/index.phtml index 2741421..7056e80 100755 --- a/application/views/scripts/event/index.phtml +++ b/application/views/scripts/event/index.phtml @@ -96,6 +96,12 @@ var dayClick = false; $('#calendar').fullCalendar("addEventSource", "/event/eventlist/poolID/" + poolID); } + $(window).load(function() { + var formularOverlappVar = getOverlappingVar(); + if(formularOverlappVar == 1) { + $( "#formularOverlappingDialog" ).dialog('open');} + }); + /* * KEYDOWN FUNCTION * delete selected event by key del(8) OR entf(46) @@ -998,6 +1004,25 @@ var dayClick = false; }); }); +//initialize formularOverlappingDialog Dialog + $(function() { + $( "#formularOverlappingDialog" ).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"); + } + }); + }); + @@ -1081,6 +1106,12 @@ between two events.

Please choose another position

+ + +