Merge lp:~nik90/ubuntu-clock-app/fix-model-usage into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Fixed incorrect saving of alarm data using alarm delegate model.

Fixed incorrect saving of alarm data using alarm delegate model.

[lp:~nik90/ubuntu-clock-app/fix-model-usage]

173. By Nekhelesh Ramananthan on 2014-11-19

Reverted other unnecessary changes

[Zsombor Egri (zsombi)]

This looks good!

[Zsombor Egri (zsombi)]

And approved :)

review: Approve

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

PASSED: Continuous integration, rev:173
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/584/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/319
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/319/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2014-10-06 19:49:17 +0000
+++ app/alarm/AlarmDelegate.qml	2014-11-19 14:56:49 +0000
@@ -92,8 +92,9 @@
 
         onCheckedChanged: {
             if (checked !== model.enabled) {
-                model.enabled = checked
-                model.save()
+                var alarmData = model
+                alarmData.enabled = checked
+                alarmData.save()
             }
         }
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-17 15:33:53 +0000
+++ debian/changelog	2014-11-19 14:56:49 +0000
@@ -28,6 +28,7 @@
   * Customised splash screen (white background) (LP: #1377638)
   * Added manual test to check disabling of alarms.
   * Fixed alarm string not being translatable (LP: #1380248)
+  * Fixed the incorrect overriding of alarm delegate model value.
 
   [Akiva Shammai Avraham]
   * Improved the analog clock performance by updating the clock hands every second