Merge lp:~nik90/ubuntu-clock-app/enable-alarms-automatically into lp:ubuntu-clock-app

[Nekhelesh Ramananthan]

Enable alarms automatically after a user updates it.

Enable alarms automatically after a user updates it.

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

PASSED: Continuous integration, rev:113
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/483/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/448
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/448/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/130

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

review: Approve (continuous-integration)

[lp:~nik90/ubuntu-clock-app/enable-alarms-automatically]

114. By Nekhelesh Ramananthan on 2014-09-24

merged with trunk

[Mihir Soni (mihirsoni)]

Looks good to me.

review: Approve

=== modified file 'app/alarm/EditAlarmPage.qml'
--- app/alarm/EditAlarmPage.qml	2014-09-16 17:00:11 +0000
+++ app/alarm/EditAlarmPage.qml	2014-09-24 11:50:41 +0000
@@ -111,7 +111,7 @@
         tempAlarm.message = _alarm.message
         tempAlarm.date = alarmTime
         tempAlarm.type = _alarm.type
-        tempAlarm.enabled = _alarm.enabled
+        tempAlarm.enabled = true
         tempAlarm.sound = _alarm.sound
         tempAlarm.daysOfWeek = _alarm.daysOfWeek
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-21 13:22:35 +0000
+++ debian/changelog	2014-09-24 11:50:41 +0000
@@ -33,6 +33,7 @@
   * Added alarm snooze settings (LP: #1354400)
   * Fixed default alarm label not being translatable (LP: #1365012)
   * Improved multiselect mode behavior and appearance (LP: #1370146)
+  * Enabled alarms automatically after updating it (LP: #1372090)
   * Automatically focus textfield (LP: #1372089)
 
   [Zsombor Egri]