Ubuntu Music App

Merge lp:~vthompson/music-app/remix-fix-1390798 into lp:music-app/remix

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

Commit message

* Show the playlist empty state when in the 'Select playlist' page

Description of the change

Show the playlist empty state when in the 'Select playlist' page. Currently the empty state is not shown in the add to playlist page (Select playlist), as it should.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:730
http://91.189.93.70:8080/job/music-app-remix-ci/236/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/96
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/96/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/11

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

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

LGTM :)

review: Approve

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 2014-10-29 12:04:22 +0000
3+++ music-app.qml 2014-11-08 21:05:16 +0000
4@@ -1118,7 +1118,7 @@
5 topMargin: -emptyPage.header.height
6 }
7 color: mainView.backgroundColor
8- visible: emptyPage.noPlaylists && !emptyPage.noMusic && playlistTab.index === tabs.selectedTab.index
9+ visible: emptyPage.noPlaylists && !emptyPage.noMusic && (playlistTab.index === tabs.selectedTab.index || mainPageStack.currentPage.title === i18n.tr("Select playlist"))
10
11 Column {
12 anchors.centerIn: parent

Subscribers

People subscribed via source and target branches