From 80ff7051991b5e04af782d86d08edb988dc46747 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 16 Mar 2006 18:17:18 +0000 Subject: [PATCH] - fixed acidently set owner by new events (multiple owners were reset to one, if you clicked inside a day-, week- or month-view) - added an icon to easier identiy non-blocking events --- calendar/inc/class.uical.inc.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/calendar/inc/class.uical.inc.php b/calendar/inc/class.uical.inc.php index d18ece78c3..c1497357ad 100644 --- a/calendar/inc/class.uical.inc.php +++ b/calendar/inc/class.uical.inc.php @@ -267,6 +267,12 @@ class uical } $set_states['owner'] = implode(',',$owners); } + // for the uiforms class (eg. edit), dont store the (new) owner, as it might change the view + if (substr($_GET['menuaction'],0,16) == 'calendar.uiforms') + { + $this->owner = $set_states[$state]; + continue; + } $states[$state] = $set_states[$state]; } elseif (!is_array($states) || !isset($states[$state])) @@ -372,6 +378,10 @@ class uical } } } + if($event['non_blocking']) + { + $icons[] = $this->html->image('calendar','nonblocking',lang('non blocking')); + } if($event['public'] == 0) { $icons[] = $this->html->image('calendar','private',lang('private'));