Merge lp:~artmello/gallery-app/gallery-app-create_album_after_confirm into lp:gallery-app

[Arthur Mello]

Delay the adding of a new album until the editor is finished

Delay the adding of a new album until the editor is finished

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1119
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1083/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/11
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/56
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/295/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/696
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/81
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16510
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/251/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/301
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/301/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/1083/rebuild

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

tested, works

review: Approve

=== modified file 'rc/qml/AlbumEditor/AlbumEditor.qml'
--- rc/qml/AlbumEditor/AlbumEditor.qml	2014-10-17 07:40:40 +0000
+++ rc/qml/AlbumEditor/AlbumEditor.qml	2014-12-11 01:44:40 +0000
@@ -219,6 +219,9 @@
             onHidden: {
                 if(album.newAlbum)
                     albumModel.destroyAlbum(album);
+                else
+                    albumCollectionModel.addOrphan(album);
+
                 overview.popPage();
                 albumEditor.closeRequested(albumEditor.album, true);
             }

=== modified file 'rc/qml/AlbumsOverview.qml'
--- rc/qml/AlbumsOverview.qml	2014-12-09 02:56:17 +0000
+++ rc/qml/AlbumsOverview.qml	2014-12-11 01:44:40 +0000
@@ -237,7 +237,6 @@
                     var album = albumCollectionModel.createOrphan();
                     album.title = i18n.tr("New Photo Album");
                     album.subtitle = i18n.tr("Subtitle");
-                    albumCollectionModel.addOrphan(album);
 
                     albumEditor.album = album;
                     overview.pushPage(albumEditor);