Merge lp:~vthompson/music-app/remix-fix-1379452 into lp:music-app/remix
Proposed by
Victor Thompson
Status: | Rejected | ||||
---|---|---|---|---|---|
Rejected by: | Victor Thompson | ||||
Proposed branch: | lp:~vthompson/music-app/remix-fix-1379452 | ||||
Merge into: | lp:music-app/remix | ||||
Diff against target: |
103 lines (+16/-16) 4 files modified
MusicStart.qml (+2/-2) common/SongsPage.qml (+2/-2) meta-database.js (+3/-3) po/com.ubuntu.music.pot (+9/-9) |
||||
To merge this branch: | bzr merge lp:~vthompson/music-app/remix-fix-1379452 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
Music App Developers | Pending | ||
Review via email: mp+238085@code.launchpad.net |
Commit message
Do not return unknown to the model
Description of the change
Do not return unknown to the model. When the translatable string is returned from the database, the query of the mediascanner models will not work. Instead, the "Unknown" strings should be added only when displayed.
To post a comment you must log in.
Unmerged revisions
- 667. By Victor Thompson
-
Update translatable strings
- 666. By Victor Thompson
-
Do not return unknown to the model
PASSED: Continuous integration, rev:666 91.189. 93.70:8080/ job/music- app-remix- ci/81/ 91.189. 93.70:8080/ job/generic- mediumtests- utopic- python3/ 904 91.189. 93.70:8080/ job/generic- mediumtests- utopic- python3/ 904/artifact/ work/output/ *zip*/output. zip 91.189. 93.70:8080/ job/music- app-remix- utopic- amd64-ci/ 81
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/music- app-remix- ci/81/rebuild
http://