From da52a27b42c2ecf53ee0fe67615ff4d194d57cf5 Mon Sep 17 00:00:00 2001 From: lkassianik Date: Fri, 8 May 2015 08:08:26 -0700 Subject: [PATCH] Calendar event detail view should show no time for all day events, and should show only one time field for one day events. Summary: Ref T8021, Calendar event detail view should show no time for all day events, and should show only one time field for one day events Test Plan: Open all-day event, event should show "Time" field with not start/end dates. Two day events should show start and end days, not times. Normal events should show old way of displaying start and end times. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin, epriestley Maniphest Tasks: T8021 Differential Revision: https://secure.phabricator.com/D12768 --- ...PhabricatorCalendarEventViewController.php | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php index 6f6fa66e6e..742ec95e3f 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php @@ -179,13 +179,31 @@ final class PhabricatorCalendarEventViewController ->setUser($viewer) ->setObject($event); - $properties->addProperty( - pht('Starts'), - phabricator_datetime($event->getDateFrom(), $viewer)); + if ($event->getIsAllDay()) { + $date_start = phabricator_date($event->getDateFrom(), $viewer); + $date_end = phabricator_date($event->getDateTo(), $viewer); - $properties->addProperty( - pht('Ends'), - phabricator_datetime($event->getDateTo(), $viewer)); + if ($date_start == $date_end) { + $properties->addProperty( + pht('Time'), + phabricator_date($event->getDateFrom(), $viewer)); + } else { + $properties->addProperty( + pht('Starts'), + phabricator_date($event->getDateFrom(), $viewer)); + $properties->addProperty( + pht('Ends'), + phabricator_date($event->getDateTo(), $viewer)); + } + } else { + $properties->addProperty( + pht('Starts'), + phabricator_datetime($event->getDateFrom(), $viewer)); + + $properties->addProperty( + pht('Ends'), + phabricator_datetime($event->getDateTo(), $viewer)); + } $properties->addProperty( pht('Host'),