Merge lp:~vthompson/ubuntu-weather-app/reboot-fix-duplicate-location-popup into lp:ubuntu-weather-app

Proposed by Victor Thompson on 2015-06-28
Status: Merged
Approved by: Andrew Hayzen on 2015-06-28
Approved revision: 58
Merged at revision: 58
Proposed branch: lp:~vthompson/ubuntu-weather-app/reboot-fix-duplicate-location-popup
Merge into: lp:ubuntu-weather-app
Diff against target: 12 lines (+1/-1)
1 file modified
app/ui/AddLocationPage.qml (+1/-1)
To merge this branch: bzr merge lp:~vthompson/ubuntu-weather-app/reboot-fix-duplicate-location-popup
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-28
Andrew Hayzen 2015-06-28 Approve on 2015-06-28
Review via email: mp+263207@code.launchpad.net

Commit message

Fix broken popup component

Description of the change

Fix broken popup component. Without this popup, the user gets no feedback as to whether the location was added.

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

LGTM :-)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/ui/AddLocationPage.qml'
2--- app/ui/AddLocationPage.qml 2015-06-21 20:14:39 +0000
3+++ app/ui/AddLocationPage.qml 2015-06-28 23:38:34 +0000
4@@ -234,7 +234,7 @@
5 if (storage.addLocation(citiesModel.get(index))) {
6 mainPageStack.pop()
7 } else {
8- PopupUtils.open(locationExistsComponent, addPage)
9+ PopupUtils.open(locationExistsComponent, addLocationPage)
10 }
11 }
12 }

Subscribers

People subscribed via source and target branches

to all changes: