Merge lp:~acerisara/ubuntu-clock-app/city-multiple-times into lp:ubuntu-clock-app/saucy

[Andrea Cerisara]

Added a check to prevent adding the same location multiple times in the clock page.

Added a check to prevent adding the same location multiple times in the clock page.

https://bugs.launchpad.net/ubuntu-clock-app/+bug/1236518.

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

PASSED: Continuous integration, rev:239
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/73/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/1069
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-precise-amd64-ci/73
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-quantal-amd64-ci/73
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/73
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/73

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

review: Approve (continuous-integration)

[Nekhelesh Ramananthan (nik90)]

lgtm! Nice work! I am not sure if this will make it into the phone image since its code freeze was supposed to be tonight. However I am still merging this into trunk. If there is time, then your fix might make it into 1.0 release.

review: Approve

=== modified file 'clock/WorldClockModel.qml'
--- clock/WorldClockModel.qml	2013-10-08 13:01:27 +0000
+++ clock/WorldClockModel.qml	2013-10-15 18:26:18 +0000
@@ -58,10 +58,30 @@
         }
     }
 
+    function indexOf(cityName)
+    {
+        for(var i = 0; i < model.count; i++) {
+            var element = model.get(i);
+
+            if(element.cityName == cityName) {
+                return i;            
+            }
+        }
+
+        return -1;
+    }
+
     function appendPreset(cityName, rawOffSet, longitude, latitude)
     {
         if (_appendDB(cityName, rawOffSet, longitude, latitude)) {
-            model.append({"cityName" : cityName, "rawOffSet" : rawOffSet, "longitude" : longitude, "latitude" : latitude})
+            var index = indexOf(cityName);
+            var location = {"cityName" : cityName, "rawOffSet" : rawOffSet, "longitude" : longitude, "latitude" : latitude}
+
+            if(index != -1) {
+                model.set(index, location);       
+            } else {
+                model.append(location);                
+            }
         }
     }