From dd8e4ff056af198aef0d027620c62c5e05f9aec4 Mon Sep 17 00:00:00 2001 From: lkassianik Date: Fri, 8 May 2015 17:04:02 -0700 Subject: [PATCH] Trim transaction overload when converting events from all-day and back Summary: Closes T8136, Trim transaction overload when converting events from all-day and back Test Plan: Create new event, save, edit, change to all-day, save, remove all-day flag, save. Feed should not show "end date changed" transaction Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin, epriestley Maniphest Tasks: T8136 Differential Revision: https://secure.phabricator.com/D12781 --- .../calendar/editor/PhabricatorCalendarEventEditor.php | 5 +++-- .../calendar/storage/PhabricatorCalendarEvent.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/applications/calendar/editor/PhabricatorCalendarEventEditor.php b/src/applications/calendar/editor/PhabricatorCalendarEventEditor.php index 8c992ce16f..6e80d19236 100644 --- a/src/applications/calendar/editor/PhabricatorCalendarEventEditor.php +++ b/src/applications/calendar/editor/PhabricatorCalendarEventEditor.php @@ -51,7 +51,7 @@ final class PhabricatorCalendarEventEditor case PhabricatorCalendarEventTransaction::TYPE_CANCEL: return $object->getIsCancelled(); case PhabricatorCalendarEventTransaction::TYPE_ALL_DAY: - return $object->getIsAllDay(); + return (int)$object->getIsAllDay(); case PhabricatorCalendarEventTransaction::TYPE_INVITE: $map = $xaction->getNewValue(); $phids = array_keys($map); @@ -89,8 +89,9 @@ final class PhabricatorCalendarEventEditor case PhabricatorCalendarEventTransaction::TYPE_DESCRIPTION: case PhabricatorCalendarEventTransaction::TYPE_CANCEL: case PhabricatorCalendarEventTransaction::TYPE_INVITE: - case PhabricatorCalendarEventTransaction::TYPE_ALL_DAY: return $xaction->getNewValue(); + case PhabricatorCalendarEventTransaction::TYPE_ALL_DAY: + return (int)$xaction->getNewValue(); case PhabricatorCalendarEventTransaction::TYPE_STATUS: return (int)$xaction->getNewValue(); case PhabricatorCalendarEventTransaction::TYPE_START_DATE: diff --git a/src/applications/calendar/storage/PhabricatorCalendarEvent.php b/src/applications/calendar/storage/PhabricatorCalendarEvent.php index 6f13d99112..133b130614 100644 --- a/src/applications/calendar/storage/PhabricatorCalendarEvent.php +++ b/src/applications/calendar/storage/PhabricatorCalendarEvent.php @@ -71,7 +71,7 @@ final class PhabricatorCalendarEvent extends PhabricatorCalendarDAO $this->getDateEpochForTimeZone( $this->getDateTo(), new DateTimeZone('Pacific/Midway'), - 'Y-m-d 23:59:59', + 'Y-m-d 23:59:00', '-1 day', $zone));