Merge lp:~nik90/ubuntu-clock-app/fix-alarm-list-refresh into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Refresh alarmModel when the alarm being edited is saved to ensure that the listview shows updated labels.

Refresh alarmModel when the alarm being edited is saved to ensure that the listview shows updated labels.

[lp:~nik90/ubuntu-clock-app/fix-alarm-list-refresh]

361. By Nekhelesh Ramananthan on 2015-08-25

Minor changelog typo fixed

362. By Nekhelesh Ramananthan on 2015-08-25

Revert making variable readonly

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

PASSED: Continuous integration, rev:360
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/809/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/154

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:362
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/810/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-vivid-amd64-ci/155

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

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Looks good, and right way to refresh the list.

review: Approve

=== modified file 'app/alarm/AlarmList.qml'
--- app/alarm/AlarmList.qml	2015-08-12 14:24:08 +0000
+++ app/alarm/AlarmList.qml	2015-08-25 11:39:26 +0000
@@ -71,7 +71,7 @@
             if (selectMode) {
                 selected = !selected
             } else {
-                pageStack.push(Qt.resolvedUrl("EditAlarmPage.qml"), {isNewAlarm: false, tempAlarm: model})
+                pageStack.push(Qt.resolvedUrl("EditAlarmPage.qml"), {isNewAlarm: false, tempAlarm: model, alarmModel: alarmModel})
             }
         }
 
 
=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2015-08-24 16:30:33 +0000
+++ app/alarm/EditAlarmPage.qml	2015-08-25 11:39:26 +0000
@@ -28,12 +28,10 @@
     id: _addAlarmPage
     objectName: "AddAlarmPage"
 
-    // Property to determine if this is a new/saved alarm
+    property var alarmModel
+    property var tempAlarm
     property bool isNewAlarm: true
 
-    // Temporary alarm used to read saved alarm and modify them
-    property var tempAlarm
-
     title: isNewAlarm ? i18n.tr("New alarm") : i18n.tr("Edit alarm")
     visible: false
 
@@ -112,6 +110,7 @@
 
         if(validateAlarm(tempAlarm)) {
             pageStack.pop()
+            alarmModel.refresh()
         }
     }
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-08-23 13:25:17 +0000
+++ debian/changelog	2015-08-25 11:39:26 +0000
@@ -28,6 +28,7 @@
   * Fixed alarm sound preview not playing when pressing on the checkbox (LP: #1487690)
   * Fixed edited alarm not being saveable if at any point of editing the alarm
     clock app loses focus (LP: #1487789)
+  * Fixed edited alarms when saved not updating the alarms listview (LP: #1488439)
 
   [Victor Thompson]
   * Show all README files in QtCreator