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

Proposed by Victor Thompson
Status: Merged
Approved by: Andrew Hayzen
Approved revision: 736
Merged at revision: 733
Proposed branch: lp:~vthompson/music-app/remix-fix-1386940
Merge into: lp:music-app/remix
Diff against target: 17 lines (+2/-2)
1 file modified
common/SongsPage.qml (+2/-2)
To merge this branch: bzr merge lp:~vthompson/music-app/remix-fix-1386940
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+241365@code.launchpad.net

Commit message

* Update the fix for catching a renamed playlist in the recent tab

Description of the change

Update the fix for catching a renamed playlist in the recent tab. Call the helper function prior to actually renaming the playlist in the Recent db.

To post a comment you must log in.
734. By Victor Thompson

add newline

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
735. By Victor Thompson

Mark MusicStart page as changed when renaming a playlist in the recent db.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
736. By Victor Thompson

Update solution to problem.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Thanks for updating the solution :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'common/SongsPage.qml'
2--- common/SongsPage.qml 2014-11-01 23:25:42 +0000
3+++ common/SongsPage.qml 2014-11-11 18:54:57 +0000
4@@ -522,11 +522,11 @@
5 Library.recentRenamePlaylist(playlistName.placeholderText, playlistName.text)
6 }
7
8+ line2 = playlistName.text
9+
10 playlistChangedHelper() // update recent/playlist models
11
12 PopupUtils.close(dialogEditPlaylist)
13-
14- line2 = playlistName.text
15 }
16 else {
17 editplaylistoutput.text = i18n.tr("Playlist already exists")

Subscribers

People subscribed via source and target branches