Ubuntu Music App

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

  1. fix-1401730
  2. Merge into remix
Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 763
Merged at revision: 764
Proposed branch: lp:~vthompson/music-app/fix-1401730
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/fix-1401730
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+244937@code.launchpad.net

Commit message

Use the proper model to determine if the library is loaded.

Description of the change

Use the proper model to determine if the library is loaded. This was broken when we (I) wrapped the model in a SortFilterModel to get case insensitive sorting.

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:763
http://91.189.93.70:8080/job/music-app-ci/1174/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/476
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/476/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/26

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

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

Nice catch :)

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-11-23 20:09:47 +0000
3+++ music-app.qml 2014-12-17 02:14:29 +0000
4@@ -1088,7 +1088,7 @@
5 title: i18n.tr("Music")
6 visible: noMusic || noPlaylists || noRecent
7
8- property bool noMusic: allSongsModel.rowCount === 0 && allSongsModel.status === SongsModel.Ready && loadedUI
9+ property bool noMusic: allSongsModel.rowCount === 0 && allSongsModelModel.status === SongsModel.Ready && loadedUI
10 property bool noPlaylists: playlistModel.model.count === 0 && playlistModel.workerComplete && mainPageStack.currentPage.title !== i18n.tr("Now playing") && mainPageStack.currentPage.title !== i18n.tr("Queue")
11 property bool noRecent: recentModel.model.count === 0 && recentModel.workerComplete && mainPageStack.currentPage.title !== i18n.tr("Now playing") && mainPageStack.currentPage.title !== i18n.tr("Queue")
12 tools: ToolbarItems {

Subscribers

People subscribed via source and target branches