Ubuntu Music App

Merge lp:~vthompson/music-app/fix-1417823-prevent-infinite-pages into lp:music-app/remix

  1. fix-1417823-prevent-infinite-pages
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 829
Merged at revision: 829
Proposed branch: lp:~vthompson/music-app/fix-1417823-prevent-infinite-pages
Merge into: lp:music-app/remix
Diff against target: 11 lines (+1/-0)
1 file modified
music-app.qml (+1/-0)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-1417823-prevent-infinite-pages
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Andrew Hayzen Approve
Review via email: mp+248464@code.launchpad.net

Commit message

* Do not show toolbar in the 'Select playlist' view

Description of the change

Do not show toolbar in the 'Select playlist' view. This prevents the user from creating cyclical page stack pushes.

To post a comment you must log in.
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Simple fix as discussed, LGTM :)

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:829
http://91.189.93.70:8080/job/music-app-ci/1274/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/968
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/968/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/126

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/1274/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'music-app.qml'
2--- music-app.qml 2015-02-03 01:26:58 +0000
3+++ music-app.qml 2015-02-04 00:31:21 +0000
4@@ -1086,6 +1086,7 @@
5 id: musicToolbar
6 visible: mainPageStack.currentPage.title !== i18n.tr("Now playing") &&
7 mainPageStack.currentPage.title !== i18n.tr("Queue") &&
8+ mainPageStack.currentPage.title !== i18n.tr("Select playlist") &&
9 !firstRun
10 objectName: "musicToolbarObject"
11 z: 200 // put on top of everything else

Subscribers

People subscribed via source and target branches