Merge lp:~dpm/ubuntu-filemanager-app/add-object-name into lp:ubuntu-filemanager-app

[David Planella]

Fix to get the tests to go to places working again. Going forward, we should probably add the objectName to the model in the plugin instead.

Fix to get the tests to go to places working again. Going forward, we should probably add the objectName to the model in the plugin instead.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:232
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/287/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1097
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1097/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/85

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/287/rebuild

review: Approve (continuous-integration)

[Brendan Donegan (brendan-donegan)]

This has my approval

review: Approve

[David Planella (dpm)]

Top-approving as per QA feedback.

=== modified file 'src/app/qml/ui/PlacesPopover.qml'
--- src/app/qml/ui/PlacesPopover.qml	2014-06-22 12:45:32 +0000
+++ src/app/qml/ui/PlacesPopover.qml	2014-07-22 10:51:51 +0000
@@ -83,7 +83,7 @@
             model: PlacesModel {}
 
             delegate: Standard {
-                objectName: model.objectName
+                objectName: "place" + folderDisplayName(path).replace(/ /g,'')
                 property string name: folderDisplayName(path)
 
                 Label {