ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~vthompson/music-app/fix-1538863 into lp:music-app with lp:~vthompson/music-app/fix-1378143 as a prerequisite.

Commit message:
Ensure that only one ContentHubExport page is open

Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Music App Developers (music-app-dev)
Related bugs:
  Bug #1538863 in Ubuntu Music App: "The export song view can be produced/stacked many times"
  https://bugs.launchpad.net/music-app/+bug/1538863

For more details, see:
https://code.launchpad.net/~vthompson/music-app/fix-1538863/+merge/284387

Ensure that only one ContentHubExport page is open
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~vthompson/music-app/fix-1538863 into lp:music-app.

=== modified file 'app/components/Helpers/ContentHubHelper.qml'
--- app/components/Helpers/ContentHubHelper.qml	2016-01-16 01:30:31 +0000
+++ app/components/Helpers/ContentHubHelper.qml	2016-01-29 04:07:33 +0000
@@ -54,6 +54,10 @@
         onExportRequested: {
             activeExportTransfer = transfer;
 
+            if (mainPageStack.currentPage.objectName === "contentHubExportPage") {
+                mainPageStack.pop()
+            }
+
             mainPageStack.push(Qt.resolvedUrl("../../ui/ContentHubExport.qml"), {contentItemComponent: resultComponent, transfer: activeExportTransfer});
         }
 

=== modified file 'app/ui/ContentHubExport.qml'
--- app/ui/ContentHubExport.qml	2016-01-29 04:07:33 +0000
+++ app/ui/ContentHubExport.qml	2016-01-29 04:07:33 +0000
@@ -30,6 +30,7 @@
 
 MusicPage {
     id: contentHubExportPage
+    objectName: "contentHubExportPage"
     title: i18n.tr("Export Track")
     searchResultsCount: songsModelFilter.count
     showToolbar: false

=== modified file 'debian/changelog'
--- debian/changelog	2016-01-29 04:07:33 +0000
+++ debian/changelog	2016-01-29 04:07:33 +0000
@@ -3,6 +3,7 @@
   [ Victor Thompson ]
   * Release 2.3 and start 2.4
   * Change translation strings from song to track
+  * Ensure that only one ContentHubExport page is open
 
  -- Victor <victor@victor-virtual-machine>  Wed, 27 Jan 2016 19:40:55 -0600