Merge lp:~ahayzen/music-app/fix-1409754-albums-uri-use-albumArtist into lp:music-app/remix

[Andrew Hayzen]

* Switch to albumArtist when using album://

* Switch to albumArtist when using album://

[Alan Pope 🍺🐧🐱 🦄 (popey)]

Tested with problematic "various" tracks and full albums.

review: Approve

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

PASSED: Continuous integration, rev:781
http://91.189.93.70:8080/job/music-app-ci/1210/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/652
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/652/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-vivid-amd64-ci/62

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

LGTM! As expected, this fix allows the Album Artist to be found by the app. Thanks for the quick turn!

review: Approve

=== modified file 'music-app.qml'
--- music-app.qml	2015-01-11 17:30:09 +0000
+++ music-app.qml	2015-01-12 20:34:30 +0000
@@ -193,7 +193,7 @@
             }
 
             // Filter by artist and album
-            songsAlbumArtistModel.artist = decodeURIComponent(split[0]);
+            songsAlbumArtistModel.albumArtist = decodeURIComponent(split[0]);
             songsAlbumArtistModel.album = decodeURIComponent(split[1]);
         }
 
@@ -752,7 +752,7 @@
                 selectedAlbum = false;
 
                 // Clear filter for artist and album
-                songsAlbumArtistModel.artist = ""
+                songsAlbumArtistModel.albumArtist = ""
                 songsAlbumArtistModel.album = ""
             }
         }