Unity 8

Merge lp:~lukas-kde/unity8/upcomingEventETA into lp:unity8

  1. upcomingEventETA
  2. Merge into trunk
Proposed by Lukáš Tinkl on 2016-04-21
Status: Merged
Approved by: Michael Zanetti on 2016-04-28
Approved revision: 2334
Merged at revision: 2350
Proposed branch: lp:~lukas-kde/unity8/upcomingEventETA
Merge into: lp:unity8
Diff against target: 18 lines (+3/-2)
1 file modified
qml/Panel/Indicators/MenuItemFactory.qml (+3/-2)
To merge this branch: bzr merge lp:~lukas-kde/unity8/upcomingEventETA
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) 2016-04-21 Abstain on 2016-04-28
Michael Zanetti (community) Approve on 2016-04-28
Unity8 CI Bot continuous-integration Needs Fixing on 2016-04-21
Review via email: mp+292539@code.launchpad.net

Commit Message

Fix upcoming event ETAs falling out of sync

Description of the Change

Fix upcoming event ETAs falling out of sync

Don't treat the event time as relative, that is ever pushing it into the future.

Fixes lpbug#1557571

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

* If you changed the UI, has there been a design review?

N/A

To post a comment you must log in.
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2334
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1038/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/595
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/595
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/595/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1393
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1363
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1363
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1363
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1363
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1363
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1363
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1363
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1363
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1363
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1363
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1363
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1363/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1363
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1363/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1038/rebuild

review: Needs Fixing (continuous-integration)
Albert Astals Cid (aacid) wrote :

Do we need the same fix in alarmItem?

review: Needs Information
Michael Zanetti (mzanetti) wrote :

> Do we need the same fix in alarmItem?

likely, let's do another branch for that. Good catch, thanks.

Michael Zanetti (mzanetti) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?

yip

 * Did CI run pass? If not, please explain why.

yes

review: Approve
Albert Astals Cid (aacid) :
review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Panel/Indicators/MenuItemFactory.qml'
2--- qml/Panel/Indicators/MenuItemFactory.qml 2016-03-23 09:53:03 +0000
3+++ qml/Panel/Indicators/MenuItemFactory.qml 2016-04-21 15:04:02 +0000
4@@ -418,11 +418,12 @@
5 property int menuIndex: -1
6 property var extendedData: menuData && menuData.ext || undefined
7
8- property date serverTime: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
9+ readonly property date serverTime: new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
10+
11 LiveTimer {
12 frequency: LiveTimer.Relative
13 relativeTime: appointmentItem.serverTime
14- onTrigger: appointmentItem.serverTime = new Date(getExtendedProperty(extendedData, "xCanonicalTime", 0) * 1000)
15+ onTrigger: appointmentItem.time = i18n.relativeDateTime(appointmentItem.serverTime)
16 }
17
18 text: menuData && menuData.label || ""

Subscribers

People subscribed via source and target branches