From 634a6991ce42fd6e24a8d42e9800f50796b6aff0 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 6 Feb 2013 13:44:10 -0500
Subject: [PATCH 1/4] CC-4865: Password reset -> Cancel -> url is missing base
 directory

-removed extra '/'
---
 airtime_mvc/public/js/airtime/login/password-restore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/public/js/airtime/login/password-restore.js b/airtime_mvc/public/js/airtime/login/password-restore.js
index 04d78f98b..4b45a59ff 100644
--- a/airtime_mvc/public/js/airtime/login/password-restore.js
+++ b/airtime_mvc/public/js/airtime/login/password-restore.js
@@ -1,3 +1,3 @@
 function redirectToLogin(){
-    window.location = baseUrl+"/Login"
+    window.location = baseUrl+"Login"
 }
\ No newline at end of file

From 55970a4b2040683d14a7a522ef70fb3b3fabfdbd Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 6 Feb 2013 14:32:13 -0500
Subject: [PATCH 2/4] CC-4925: Changing User permissions to a higher level ends
 up with show editing problems

- added check to ensure user is not an admin before assigning the 'dj-edit-show' action
---
 airtime_mvc/application/controllers/ScheduleController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 1f3216eed..20214f093 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -573,7 +573,10 @@ class ScheduleController extends Zend_Controller_Action
             return;
         }
 
-        if ($isDJ) {
+        // in case a user was once a dj and had been assigned to a show
+        // but was then changed to an admin user we need to allow
+        // the user to edit the show as an admin (CC-4925)
+        if ($isDJ && !$idAdminOrPM) {
             $this->view->action = "dj-edit-show";
         }
 

From ba4cb16171a6093067219aae8cb5c25aae629bd4 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 6 Feb 2013 14:35:39 -0500
Subject: [PATCH 3/4] CC-4925: Changing User permissions to a higher level ends
 up with show editing problems

-typo
---
 airtime_mvc/application/controllers/ScheduleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php
index 20214f093..1a908ec63 100644
--- a/airtime_mvc/application/controllers/ScheduleController.php
+++ b/airtime_mvc/application/controllers/ScheduleController.php
@@ -576,7 +576,7 @@ class ScheduleController extends Zend_Controller_Action
         // in case a user was once a dj and had been assigned to a show
         // but was then changed to an admin user we need to allow
         // the user to edit the show as an admin (CC-4925)
-        if ($isDJ && !$idAdminOrPM) {
+        if ($isDJ && !$isAdminOrPM) {
             $this->view->action = "dj-edit-show";
         }
 

From ad334d9e74839905a11ba03056ee11764ea2894d Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860sourcefabric.org>
Date: Wed, 6 Feb 2013 15:44:52 -0500
Subject: [PATCH 4/4] CC-4926: System-> Preference: Please limit the default
 fade value less than 60

- added a range validator of 0 - 59.9 on default fade
---
 airtime_mvc/application/forms/GeneralPreferences.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php
index 48a561b06..3d249ce47 100644
--- a/airtime_mvc/application/forms/GeneralPreferences.php
+++ b/airtime_mvc/application/forms/GeneralPreferences.php
@@ -7,6 +7,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
     {
 
         $notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator();
+        $rangeValidator = Application_Form_Helper_ValidationTypes::overrideBetweenValidator(0, 59.9);
         $this->setDecorators(array(
             array('ViewScript', array('viewScript' => 'form/preferences_general.phtml'))
         ));
@@ -34,9 +35,13 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
             'label'      => _('Default Fade (s):'),
             'required'   => true,
             'filters'    => array('StringTrim'),
-            'validators' => array(array($notEmptyValidator, 'regex', false,
-                array('/^[0-9]{1,2}(\.\d{1})?$/',
-                'messages' => _('enter a time in seconds 0{.0}')))),
+            'validators' => array(
+                array(
+                    $rangeValidator,
+                    $notEmptyValidator,
+                    'regex', false, array('/^[0-9]{1,2}(\.\d{1})?$/', 'messages' => _('enter a time in seconds 0{.0}'))
+                )
+            ),
             'value' => $defaultFade,
             'decorators' => array(
                 'ViewHelper'