Merge lp:~marcustomlinson/unity-scope-mediascanner/my-music-cardinality into lp:unity-scope-mediascanner

Proposed by Marcus Tomlinson on 2016-01-28
Status: Merged
Approved by: Paweł Stołowski on 2016-01-28
Approved revision: 291
Merged at revision: 293
Proposed branch: lp:~marcustomlinson/unity-scope-mediascanner/my-music-cardinality
Merge into: lp:unity-scope-mediascanner
Diff against target: 33 lines (+3/-2)
2 files modified
src/musicaggregator/musicaggregatorquery.cpp (+1/-1)
src/mymusic/music-scope.cpp (+2/-1)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scope-mediascanner/my-music-cardinality
Reviewer Review Type Date Requested Status
Paweł Stołowski 2016-01-28 Approve on 2016-01-28
Review via email: mp+284267@code.launchpad.net

Commit message

Fix My Music "concierge" card and render 3 results in the "My Music" category of the Music aggregator (as per design)

To post a comment you must log in.
Paweł Stołowski (stolowski) wrote :

Looks good, thanks!

review: Approve
Paweł Stołowski (stolowski) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/musicaggregator/musicaggregatorquery.cpp'
2--- src/musicaggregator/musicaggregatorquery.cpp 2016-01-13 16:36:09 +0000
3+++ src/musicaggregator/musicaggregatorquery.cpp 2016-01-28 13:20:56 +0000
4@@ -348,7 +348,7 @@
5 {
6 if (empty_search)
7 {
8- metadata.set_cardinality(4);
9+ metadata.set_cardinality(3);
10 }
11 }
12 else if (scopes[i].id == MusicAggregatorScope::SOUNDCLOUD)
13
14=== modified file 'src/mymusic/music-scope.cpp'
15--- src/mymusic/music-scope.cpp 2016-01-13 04:26:08 +0000
16+++ src/mymusic/music-scope.cpp 2016-01-28 13:20:56 +0000
17@@ -61,7 +61,7 @@
18 "title": "title",
19 "art": {
20 "field": "art",
21- "conciergeMode": true,
22+ "conciergeMode": true
23 },
24 "summary" : "summary"
25 }
26@@ -152,6 +152,7 @@
27 "template": {
28 "category-layout": "grid",
29 "card-size": "large",
30+ "collapsed-rows": 3,
31 "card-layout": "horizontal",
32 "quick-preview-type" : "audio"
33 },

Subscribers

People subscribed via source and target branches

to all changes: