Merge lp:~rpadovani/ubuntu-clock-app/1197436 into lp:ubuntu-clock-app/saucy

[Riccardo Padovani]

Added adminName to WorldCity, see #1197436

Added adminName to WorldCity, see #1197436

[Nekhelesh Ramananthan (nik90)]

lgtm! Nice work!

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-clock-app-autolanding/17/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-autolanding/2/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-autolanding/16/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-autolanding/16/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-autolanding/2/console

review: Needs Fixing (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

Reapproving since build failed due to jenkin bots failing while try to merge branch.

Build step 'Debian PBuilder NG' marked build as failure
Looks like the node went offline during the build. Check the slave log for the details.
FATAL: channel is already closed
hudson.remoting.ChannelClosedException: channel is already closed
 at hudson.remoting.Channel.send(Channel.java:486)
 at hudson.remoting.Request.call(Request.java:110)
 at hudson.remoting.Channel.call(Channel.java:668)
 at hudson.Launcher$RemoteLauncher.kill(Launcher.java:812)
 at hudson.model.AbstractBuild$AbstractRunner.run(AbstractBuild.java:481)
 at hudson.model.Run.run(Run.java:1376)
 at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:46)
 at hudson.model.ResourceController.execute(ResourceController.java:88)
 at hudson.model.Executor.run(Executor.java:175)
Caused by: java.net.SocketException: Socket closed
 at java.net.SocketInputStream.socketRead0(Native Method)
 at java.net.SocketInputStream.read(SocketInputStream.java:146)
 at java.io.BufferedInputStream.fill(BufferedInputStream.java:235)
 at java.io.BufferedInputStream.read(BufferedInputStream.java:254)
 at java.io.ObjectInputStream$PeekInputStream.peek(ObjectInputStream.java:2290)
 at java.io.ObjectInputStream$BlockDataInputStream.peek(ObjectInputStream.java:2583)
 at java.io.ObjectInputStream$BlockDataInputStream.peekByte(ObjectInputStream.java:2593)
 at java.io.ObjectInputStream.readObject0(ObjectInputStream.java:1315)
 at java.io.ObjectInputStream.readObject(ObjectInputStream.java:369)
 at hudson.remoting.Channel$ReaderThread.run(Channel.java:1031)

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

review: Approve (continuous-integration)

=== modified file 'clock/WorldClock.qml'
--- clock/WorldClock.qml	2013-07-09 17:21:12 +0000
+++ clock/WorldClock.qml	2013-07-12 11:10:30 +0000
@@ -30,7 +30,7 @@
     signal clicked()
 
     function searchCityUrl (city) {
-        return (search_base_url + search_string + "&maxRows=" + no_of_results + "&username=" + username);
+        return (search_base_url + search_string + "&maxRows=" + no_of_results + "&username=" + username + "&style=full");
     }
 
     function localCityUrl () {
@@ -62,6 +62,7 @@
         XmlRole { name: "country"; query: "countryName/string()"; isKey: true }
         XmlRole { name: "lat"; query: "lat/string()"; isKey: true }
         XmlRole { name: "lng"; query: "lng/string()"; isKey: true }
+        XmlRole { name: "adminName"; query: "adminName1/string()"; isKey: true}
 
         onSourceChanged: reload();
     }
@@ -141,7 +142,7 @@
 
         delegate: ListItem.Standard {
             Label {
-                text: searchCityModel.status == XmlListModel.Ready ? city + ", " + country : i18n.tr("Loading");
+                text: searchCityModel.status == XmlListModel.Ready ? (adminName ? (city + ", " + adminName + ", " + country) : (city + ", " + country)) : i18n.tr("Loading");
                 anchors { verticalCenter: parent.verticalCenter; left: parent.left; leftMargin: units.gu(3) }
                 fontSize: "large"
             }