Ubuntu Calendar App

Merge lp://qastaging/~pkunal-parmar/ubuntu-calendar-app/timelinefix into lp://qastaging/ubuntu-calendar-app

timelinefix
Merge into trunk

Proposed by Kunal Parmar on 2013-09-02

Status:

Merged

Approved by:

Olivier Tilloy on 2013-09-03

Approved revision:

100

Merged at revision:

100

Proposed branch:

lp://qastaging/~pkunal-parmar/ubuntu-calendar-app/timelinefix

Merge into:

lp://qastaging/ubuntu-calendar-app

Diff against target:

137 lines (+18/-29)

4 files modified

DayComponent.qml (+3/-2)
EventDetails.qml (+2/-2)
TimeLineBase.qml (+9/-22)
WeekComponent.qml (+4/-3)

To merge this branch:

bzr merge lp://qastaging/~pkunal-parmar/ubuntu-calendar-app/timelinefix

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Olivier Tilloy (community)		2013-09-02	Approve on 2013-09-03
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-09-03
Review via email: mp+183549@code.qastaging.launchpad.net

Commit message

fix for bug #1219930

Description of the change

fix for bug #1219930,

Map removed using Model data directly.

Revision history for this message

Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote on 2013-09-02:

FAILED: Continuous integration, rev:99
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/41/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests/158
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-precise-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-quantal-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-ci/41
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-ci/41

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/41/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-09-03:

87 if( i === intern.now.getHours()
88 && intern.now.isSameDay( bubbleOverLay.day )) {
89 - bubbleOverLay.showSeparator(i);
90 + bubbleOverLay.showSeparator(event.startTime.getHours());
91 }

This condition is outdated, i is not an hour any longer, it’s the index of the current event in the model.
I think the separator should be shown at the end of instantiating all the event bubbles, not in the for loop itself.

review: Needs Fixing

Revision history for this message

Olivier Tilloy (osomon) wrote on 2013-09-03:

Note that the autopilot tests are failing due to a change in the UITK’s Toolbar API which went in without notice, I’ve been told that it is being reverted.

lp://qastaging/~pkunal-parmar/ubuntu-calendar-app/timelinefix updated on 2013-09-03