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

[Victor Thompson]

Fix for playlist deletion in recent DB

Fix for playlist deletion in recent DB. Set to force the filter/change flag if we are calling after the playlist is deleted.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:734
http://91.189.93.70:8080/job/music-app-remix-ci/249/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/158
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/158/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-ci/24

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :)

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/music-app-remix-autolanding/97/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/160
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/160/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/music-app-remix-vivid-amd64-autolanding/8/console

review: Needs Fixing (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'common/SongsPage.qml'
--- common/SongsPage.qml	2014-11-11 18:54:47 +0000
+++ common/SongsPage.qml	2014-11-11 20:09:42 +0000
@@ -61,8 +61,10 @@
         onTriggered: albumTracksModel.filterPlaylistTracks(line2)
     }
 
-    function playlistChangedHelper()
+    function playlistChangedHelper(force)
     {
+        force = force === undefined ? false : force  // default force to false
+
         // if parent Playlists then set changed otherwise refilter
         if (songStackPage.page.title === i18n.tr("Playlists")) {
             if (songStackPage.page !== undefined) {
@@ -72,7 +74,7 @@
             playlistModel.filterPlaylists()
         }
 
-        if (Library.recentContainsPlaylist(songStackPage.line2)) {
+        if (Library.recentContainsPlaylist(songStackPage.line2) || force) {
             // if parent Recent then set changed otherwise refilter
             if (songStackPage.page.title === i18n.tr("Recent")) {
                 if (songStackPage.page !== undefined) {
@@ -567,7 +569,7 @@
                         Library.recentRemovePlaylist(dialogRemovePlaylist.oldPlaylistName)
                     }
 
-                    playlistChangedHelper()  // update recent/playlist models
+                    playlistChangedHelper(true)  // update recent/playlist models
 
                     songStackPage.page = undefined
                     PopupUtils.close(dialogRemovePlaylist)