From 32cbfce4dd38110461904d8ba72e0b3d7a02ad61 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Tue, 7 Dec 2010 21:25:30 +0100 Subject: [PATCH] Add user name of shared calendars as suffix. We sort by calendar name anyway. --- kronolith/lib/Calendar/External/Tasks.php | 4 ++-- kronolith/lib/Calendar/Internal.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kronolith/lib/Calendar/External/Tasks.php b/kronolith/lib/Calendar/External/Tasks.php index 42b8e9b4a..adbd88a8d 100644 --- a/kronolith/lib/Calendar/External/Tasks.php +++ b/kronolith/lib/Calendar/External/Tasks.php @@ -30,8 +30,8 @@ class Kronolith_Calendar_External_Tasks extends Kronolith_Calendar_External $this->_share->get('owner') == $GLOBALS['registry']->getAuth(); $hash = parent::toHash(); - $hash['name'] = ($owner || !$this->_share->get('owner') ? '' : '[' . $GLOBALS['registry']->convertUsername($this->_share->get('owner'), false) . '] ') - . $this->_share->get('name'); + $hash['name'] = $this->_share->get('name') + . ($owner || !$this->_share->get('owner') ? '' : ' [' . $GLOBALS['registry']->convertUsername($this->_share->get('owner'), false) . ']'); $hash['desc'] = $this->_share->get('desc'); $hash['owner'] = $owner; $hash['fg'] = Kronolith::foregroundColor($this->_share); diff --git a/kronolith/lib/Calendar/Internal.php b/kronolith/lib/Calendar/Internal.php index 488d68fb7..1997c3721 100644 --- a/kronolith/lib/Calendar/Internal.php +++ b/kronolith/lib/Calendar/Internal.php @@ -133,8 +133,8 @@ class Kronolith_Calendar_Internal extends Kronolith_Calendar $this->owner() == $GLOBALS['registry']->getAuth(); $hash = parent::toHash(); - $hash['name'] = ($owner || !$this->owner() ? '' : '[' . $GLOBALS['registry']->convertUsername($this->owner(), false) . '] ') - . $this->name(); + $hash['name'] = $this->name() + . ($owner || !$this->owner() ? '' : ' [' . $GLOBALS['registry']->convertUsername($this->owner(), false) . ']'); $hash['owner'] = $owner; $hash['show'] = in_array($id, $GLOBALS['display_calendars']); $hash['edit'] = $this->hasPermission(Horde_Perms::EDIT); -- 2.11.0