From 6b8163748d31f8ab8c008db07660d4b4a7ca46cb Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Thu, 13 Nov 2014 09:46:44 -0500 Subject: [PATCH 1/6] Updated styles for csrf elements --- airtime_mvc/public/css/styles.css | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index dac9be3c4..d4087fa8f 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -896,13 +896,23 @@ input[type="checkbox"] { } /*---//////////////////// LOGIN & PASSWORD RESET ////////////////////---*/ -#csrf-label, #csrf-element { - /* Remove any visible csrf form token footprint */ +/* Remove any visible csrf form token footprint */ +#csrf-label { height: 0; padding: 0; margin: 0; } +#csrf-element { + height: 8px; + padding: 0; + margin: 0; +} + +#csrf-label .errors li, #csrf-element .errors li { + margin: 0; +} + .login_box { margin: 0 auto 0 auto; text-align:center; From 51274920e1430a9842da6f3472ac7f21eaffc919 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Thu, 13 Nov 2014 10:20:58 -0500 Subject: [PATCH 2/6] Cosmetic updates --- .../rest/controllers/MediaController.php | 49 ++++++------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php index d9416548c..7427509c6 100644 --- a/airtime_mvc/application/modules/rest/controllers/MediaController.php +++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php @@ -26,8 +26,8 @@ class Rest_MediaController extends Zend_Rest_Controller public function init() { $this->view->layout()->disableLayout(); - // Remove reliance on .phtml files to render requests - $this->_helper->viewRenderer->setNoRender(true); + // Remove reliance on .phtml files to render requests + $this->_helper->viewRenderer->setNoRender(true); } public function indexAction() @@ -112,7 +112,7 @@ class Rest_MediaController extends Zend_Rest_Controller public function getAction() { if (!$this->verifyAuth(true, true)) - { + { return; } @@ -316,11 +316,7 @@ class Rest_MediaController extends Zend_Rest_Controller $observed_csrf_token = $token; $expected_csrf_token = $current_namespace->authtoken; - if($observed_csrf_token == $expected_csrf_token){ - return true; - }else{ - return false; - } + return ($observed_csrf_token === $expected_csrf_token); } private function verifyAuth($checkApiKey, $checkSession) @@ -331,7 +327,7 @@ class Rest_MediaController extends Zend_Rest_Controller if(!$this->verifyCSRFToken($this->_getParam('csrf_token'))){ $resp = $this->getResponse(); $resp->setHttpResponseCode(401); - $resp->appendBody("ERROR: Token Missmatch."); + $resp->appendBody("ERROR: Token Mismatch."); return false; } return true; @@ -361,24 +357,13 @@ class Rest_MediaController extends Zend_Rest_Controller $encodedRequestApiKey = substr($authHeader, strlen("Basic ")); $encodedStoredApiKey = base64_encode($CC_CONFIG["apiKey"][0] . ":"); - if ($encodedRequestApiKey === $encodedStoredApiKey) - { - return true; - } else { - return false; - } - - return false; + return ($encodedRequestApiKey === $encodedStoredApiKey); } private function verifySession() { $auth = Zend_Auth::getInstance(); - if ($auth->hasIdentity()) - { - return true; - } - return false; + return ($auth->hasIdentity()); //Token checking stub code. We'd need to change LoginController.php to generate a token too, but //but luckily all the token code already exists and works. @@ -488,7 +473,7 @@ class Rest_MediaController extends Zend_Rest_Controller return $service_user->getCurrentUser()->getDbId(); } else { $defaultOwner = CcSubjsQuery::create() - ->filterByDbType('A') + ->filterByDbType(array('A', 'S'), Criteria::IN) ->orderByDbId() ->findOne(); if (!$defaultOwner) { @@ -504,23 +489,21 @@ class Rest_MediaController extends Zend_Rest_Controller } /** - * + * * Strips out fields from incoming request data that should never be modified * from outside of Airtime - * @param array $data + * + * @param array $data */ - private static function removeBlacklistedFieldsFromRequestData($data) - { + private static function removeBlacklistedFieldsFromRequestData($data) { foreach (self::$blackList as $key) { unset($data[$key]); } - - return $data; - } + + return $data; + } - - private function removeEmptySubFolders($path) - { + private function removeEmptySubFolders($path) { exec("find $path -empty -type d -delete"); } From c24a040689253d81fd8fd81b304a2cc08887d1a3 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 14 Jan 2015 14:34:14 -0500 Subject: [PATCH 3/6] Fixed my SuperAdmin_Only decorator --- airtime_mvc/application/forms/GeneralPreferences.php | 2 +- airtime_mvc/application/forms/helpers/CustomDecorators.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index 0a6b2335c..fd1e00a7a 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -104,7 +104,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm monospace;', 'value' => self::getWidgetCode(), )); - $this->getElement('widgetCode')->addDecorator(new Airtime_Decorator_SuperAdmin_Only()); + $locale = new Zend_Form_Element_Select("locale"); $locale->setLabel(_("Default Language")); $locale->setMultiOptions(Application_Model_Locale::getLocales()); diff --git a/airtime_mvc/application/forms/helpers/CustomDecorators.php b/airtime_mvc/application/forms/helpers/CustomDecorators.php index 316774b89..27a3db99f 100644 --- a/airtime_mvc/application/forms/helpers/CustomDecorators.php +++ b/airtime_mvc/application/forms/helpers/CustomDecorators.php @@ -5,7 +5,7 @@ class Airtime_Decorator_SuperAdmin_Only extends Zend_Form_Decorator_Abstract public function render($content) { $currentUser = Application_Model_User::getCurrentUser(); - if (!$currentUser->isSuperAdmin()) { + if ($currentUser->isSuperAdmin()) { return $content; } else { return ""; From 609a46dfa3d994bb31dfcf1ebff055f3a566b99c Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 14 Jan 2015 15:12:20 -0500 Subject: [PATCH 4/6] Comment Airtime_Decorator_SuperAdmin_Only --- airtime_mvc/application/forms/helpers/CustomDecorators.php | 1 + 1 file changed, 1 insertion(+) diff --git a/airtime_mvc/application/forms/helpers/CustomDecorators.php b/airtime_mvc/application/forms/helpers/CustomDecorators.php index 27a3db99f..f9ad02f8f 100644 --- a/airtime_mvc/application/forms/helpers/CustomDecorators.php +++ b/airtime_mvc/application/forms/helpers/CustomDecorators.php @@ -1,5 +1,6 @@ Date: Thu, 15 Jan 2015 16:28:18 -0500 Subject: [PATCH 5/6] Moved the Station Logo field to GeneralPreferences, and stopped using AJAX on the general prefs form --- .../controllers/PreferenceController.php | 31 ++++++++----------- .../application/forms/GeneralPreferences.php | 15 +++++++++ airtime_mvc/application/forms/Preferences.php | 10 ++++-- .../application/forms/SupportSettings.php | 13 -------- .../views/scripts/form/preferences.phtml | 4 ++- .../scripts/form/preferences_general.phtml | 4 +++ .../views/scripts/form/support-setting.phtml | 20 ------------ .../views/scripts/preference/index.phtml | 9 +++--- airtime_mvc/public/css/styles.css | 1 + .../js/airtime/preferences/preferences.js | 5 +-- 10 files changed, 50 insertions(+), 62 deletions(-) diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index 84718c66d..767fd3b62 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -34,15 +34,11 @@ class PreferenceController extends Zend_Controller_Action $form = new Application_Form_Preferences(); $values = array(); - if ($request->isPost()) { - $params = $request->getPost(); - $postData = explode('&', $params['data']); - foreach($postData as $k=>$v) { - $v = explode('=', $v); - $values[$v[0]] = urldecode($v[1]); - } - if ($form->isValid($values)) { + if ($request->isPost()) { + $values = $request->getPost(); + if ($form->isValid($values)) + { Application_Model_Preference::SetHeadTitle($values["stationName"], $this->view); Application_Model_Preference::SetDefaultCrossfadeDuration($values["stationDefaultCrossfadeDuration"]); Application_Model_Preference::SetDefaultFadeIn($values["stationDefaultFadeIn"]); @@ -52,6 +48,11 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetDefaultTimezone($values["timezone"]); Application_Model_Preference::SetWeekStartDay($values["weekStartDay"]); + $logoUploadElement = $form->getSubForm('preferences_general')->getElement('stationLogo'); + $logoUploadElement->receive(); + $imagePath = $logoUploadElement->getFileName(); + Application_Model_Preference::SetStationLogo($imagePath); + Application_Model_Preference::SetEnableSystemEmail($values["enableSystemEmail"]); Application_Model_Preference::SetSystemEmail($values["systemEmail"]); Application_Model_Preference::SetMailServerConfigured($values["configureMailServer"]); @@ -73,12 +74,14 @@ class PreferenceController extends Zend_Controller_Action $this->view->statusMsg = "
". _("Preferences updated.")."
"; $this->view->form = $form; - $this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml'))); + //$this->_helper->json->sendJson(array("valid"=>"true", "html"=>$this->view->render('preference/index.phtml'))); } else { $this->view->form = $form; - $this->_helper->json->sendJson(array("valid"=>"false", "html"=>$this->view->render('preference/index.phtml'))); + //$this->_helper->json->sendJson(array("valid"=>"false", "html"=>$this->view->render('preference/index.phtml'))); } } + $this->view->logoImg = Application_Model_Preference::GetStationLogo(); + $this->view->form = $form; } @@ -111,13 +114,9 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::SetSupportFeedback($values["SupportFeedback"]); Application_Model_Preference::SetPublicise($values["Publicise"]); - $form->Logo->receive(); - $imagePath = $form->Logo->getFileName(); - Application_Model_Preference::SetStationCountry($values["Country"]); Application_Model_Preference::SetStationCity($values["City"]); Application_Model_Preference::SetStationDescription($values["Description"]); - Application_Model_Preference::SetStationLogo($imagePath); if (isset($values["Privacy"])) { Application_Model_Preference::SetPrivacyPolicyCheck($values["Privacy"]); } @@ -125,10 +124,6 @@ class PreferenceController extends Zend_Controller_Action $this->view->statusMsg = "
"._("Support setting updated.")."
"; } - $logo = Application_Model_Preference::GetStationLogo(); - if ($logo) { - $this->view->logoImg = $logo; - } $privacyChecked = false; if (Application_Model_Preference::GetPrivacyPolicyCheck() == 1) { $privacyChecked = true; diff --git a/airtime_mvc/application/forms/GeneralPreferences.php b/airtime_mvc/application/forms/GeneralPreferences.php index d956b8d1e..52f14332a 100644 --- a/airtime_mvc/application/forms/GeneralPreferences.php +++ b/airtime_mvc/application/forms/GeneralPreferences.php @@ -1,11 +1,14 @@ setEnctype(Zend_Form::ENCTYPE_MULTIPART); $notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator(); $rangeValidator = Application_Form_Helper_ValidationTypes::overrideBetweenValidator(0, 59.9); @@ -34,6 +37,18 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm $stationDescription->setAttrib('rows', 4); $this->addElement($stationDescription); + // Station Logo + $stationLogoUpload = new Zend_Form_Element_File('stationLogo'); + $stationLogoUpload->setLabel(_('Station Logo:')) + ->setDescription(_("Note: Anything larger than 600x600 will be resized.")) + ->setRequired(false) + ->addValidator('Count', false, 1) + ->addValidator('Extension', false, 'jpg,jpeg,png,gif') + ->setMaxFileSize(1000000) + ->addFilter('ImageSize'); + $stationLogoUpload->setAttrib('accept', 'image/*'); + $this->addElement($stationLogoUpload); + //Default station crossfade duration $this->addElement('text', 'stationDefaultCrossfadeDuration', array( 'class' => 'input_text', diff --git a/airtime_mvc/application/forms/Preferences.php b/airtime_mvc/application/forms/Preferences.php index 977cae355..7187c467c 100644 --- a/airtime_mvc/application/forms/Preferences.php +++ b/airtime_mvc/application/forms/Preferences.php @@ -7,9 +7,6 @@ class Application_Form_Preferences extends Zend_Form { $baseUrl = Application_Common_OsPath::getBaseDir(); - $this->setMethod('post'); - - $this->setDecorators(array( array('ViewScript', array('viewScript' => 'form/preferences.phtml')) )); @@ -31,5 +28,12 @@ class Application_Form_Preferences extends Zend_Form $soundcloud_pref = new Application_Form_SoundcloudPreferences(); $this->addSubForm($soundcloud_pref, 'preferences_soundcloud'); + $submit = new Zend_Form_Element_Submit('submit'); + $submit->setLabel(_('Save')); + //$submit->removeDecorator('Label'); + $submit->setAttribs(array('class'=>'btn right-floated')); + $submit->removeDecorator('DtDdWrapper'); + + $this->addElement($submit); } } diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php index 87e5588de..0fbf0ccf7 100644 --- a/airtime_mvc/application/forms/SupportSettings.php +++ b/airtime_mvc/application/forms/SupportSettings.php @@ -1,7 +1,5 @@ setAttrib('COLS','58'); $this->addElement($description); - // Station Logo - $upload = new Zend_Form_Element_File('Logo'); - $upload->setLabel(_('Station Logo:')) - ->setRequired(false) - ->setDecorators(array('File')) - ->addValidator('Count', false, 1) - ->addValidator('Extension', false, 'jpg,jpeg,png,gif') - ->addFilter('ImageSize'); - $upload->setAttrib('accept', 'image/*'); - $this->addElement($upload); - //enable support feedback $this->addElement('checkbox', 'SupportFeedback', array( 'label' => _('Send support feedback'), diff --git a/airtime_mvc/application/views/scripts/form/preferences.phtml b/airtime_mvc/application/views/scripts/form/preferences.phtml index afc324126..53062036a 100644 --- a/airtime_mvc/application/views/scripts/form/preferences.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences.phtml @@ -1,7 +1,7 @@
element->getElement('csrf') ?> + element->getSubform('preferences_general') ?> -

element->getSubform('preferences_email_server') ?> @@ -12,5 +12,7 @@
element->getSubform('preferences_soundcloud') ?>
+
+ element->submit->render() ?> diff --git a/airtime_mvc/application/views/scripts/form/preferences_general.phtml b/airtime_mvc/application/views/scripts/form/preferences_general.phtml index de3f6b13d..7bf5d487d 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_general.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_general.phtml @@ -5,6 +5,10 @@ element->getElement('stationDescription')->render() ?> + element->getElement('stationLogo')->render() ?> + +
+ element->getElement('locale')->render() ?> element->getElement('timezone')->render() ?> diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml index b1c0a3e37..7b164bdee 100644 --- a/airtime_mvc/application/views/scripts/form/support-setting.phtml +++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml @@ -143,26 +143,6 @@ -
- -
-
- element->getView()->logoImg){?> -
- - - element->getElement('Logo') ?> -
-

-
- element->getElement('Logo')->hasErrors()) : ?> -
    - element->getElement('Logo')->getMessages() as $error): ?> -
    • - -
- -
diff --git a/airtime_mvc/application/views/scripts/preference/index.phtml b/airtime_mvc/application/views/scripts/preference/index.phtml index 7d84200b4..147cd1b99 100644 --- a/airtime_mvc/application/views/scripts/preference/index.phtml +++ b/airtime_mvc/application/views/scripts/preference/index.phtml @@ -1,16 +1,15 @@

-
- - + + + form->getElement('submit')->render() ?>
- + statusMsg; echo $this->form; ?>
-
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index a868e5df7..f5442493d 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -2121,6 +2121,7 @@ span.errors.sp-errors{ } .preferences { width: 500px; + margin-bottom: 40px; } .manage-folders { width: 610px; diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js index e774033d0..4f37d7033 100644 --- a/airtime_mvc/public/js/airtime/preferences/preferences.js +++ b/airtime_mvc/public/js/airtime/preferences/preferences.js @@ -103,7 +103,8 @@ $(document).ready(function() { $(this).toggleClass("closed"); return false; }).next().hide(); - + + /* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert $('#pref_save').live('click', function() { var data = $('#pref_form').serialize(); var url = baseUrl+'Preference/index'; @@ -116,7 +117,7 @@ $(document).ready(function() { setConfigureMailServerListener(); setEnableSystemEmailsListener(); }); - }); + });*/ showErrorSections(); From 239aae029e371592def9f5568036440ea0956c3c Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Thu, 22 Jan 2015 17:30:29 -0500 Subject: [PATCH 6/6] Added image_path to unit tests. --- .../models/database/datasets/test_checkOverlappingShows.xml | 4 +++- .../database/datasets/test_ccShowInsertedIntoDatabase.xml | 4 +++- .../datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml | 4 +++- .../datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml | 4 +++- .../services/database/datasets/test_createLinkedShow.xml | 4 +++- .../datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml | 4 +++- .../datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml | 4 +++- .../database/datasets/test_createNoRepeatNoRRShow.xml | 4 +++- .../services/database/datasets/test_createNoRepeatRRShow.xml | 4 +++- .../datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml | 4 +++- .../datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml | 4 +++- .../datasets/test_createWeeklyRepeatNoEndNoRRShow.xml | 4 +++- .../database/datasets/test_createWeeklyRepeatRRShow.xml | 4 +++- .../services/database/datasets/test_deleteShowInstance.xml | 4 +++- .../datasets/test_deleteShowInstanceAndAllFollowing.xml | 4 +++- .../datasets/test_editRepeatingShowChangeNoEndOption.xml | 4 +++- .../database/datasets/test_editRepeatingShowInstance.xml | 4 +++- .../test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml | 4 +++- .../test_repeatShowCreationWhenUserMovesForwardInCalendar.xml | 4 +++- .../services/database/datasets/test_unlinkLinkedShow.xml | 4 +++- .../services/database/datasets/test_weeklyToBiWeekly.xml | 4 +++- .../services/database/datasets/test_weeklyToNoRepeat.xml | 4 +++- 22 files changed, 66 insertions(+), 22 deletions(-) diff --git a/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.xml b/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.xml index a3b746711..c188785f1 100644 --- a/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.xml +++ b/airtime_mvc/tests/application/models/database/datasets/test_checkOverlappingShows.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -338,4 +340,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml b/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml index d790f8985..63d708773 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + - \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml b/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml index 3de4e16d9..3534b110f 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_changeRepeatDayUpdatesScheduleCorrectly.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 1 + @@ -134,4 +136,4 @@ 1 - \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml index 7432957b5..9f538785c 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createBiWeeklyRepeatNoEndNoRRShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -104,4 +106,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.xml index 871729009..04d650680 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createLinkedShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 1 + @@ -134,4 +136,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml index b2140cdfd..3b4a2af2f 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyMonthlyRepeatNoEndNoRRShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -94,4 +96,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml index 69b6a471e..57d8453b1 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createMonthlyWeeklyRepeatNoEndNoRRShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -94,4 +96,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.xml index dc49416a0..112bb8f07 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatNoRRShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -84,4 +86,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.xml index d58ada9f5..32ba5b63e 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createNoRepeatRRShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -248,4 +250,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml index 854af10eb..4b820e959 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createQuadWeeklyRepeatNoEndNoRRShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -94,4 +96,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml index 2eb7e2b75..c14e4550d 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createTriWeeklyRepeatNoEndNoRRShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -94,4 +96,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.xml index b6a7c709b..197f3b635 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatNoEndNoRRShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -134,4 +136,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml index b29bb7388..517a687fe 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_createWeeklyRepeatRRShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -270,4 +272,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.xml b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.xml index 108680979..84b85c245 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstance.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -134,4 +136,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.xml b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.xml index cdf4f2e37..dfbe6f1ac 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_deleteShowInstanceAndAllFollowing.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -260,4 +262,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.xml b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.xml index 20c281c17..e4923004d 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowChangeNoEndOption.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -94,4 +96,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.xml b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.xml index 860e77eaa..a780eebe8 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_editRepeatingShowInstance.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -157,4 +159,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml b/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml index 3de4e16d9..3534b110f 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_removeFirstRepeatShowDayUpdatesScheduleCorrectly.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 1 + @@ -134,4 +136,4 @@ 1 - \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.xml b/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.xml index d5f6ea36d..12be75eb6 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_repeatShowCreationWhenUserMovesForwardInCalendar.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -134,4 +136,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.xml b/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.xml index 27551bbc7..f279c0a23 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_unlinkLinkedShow.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ + @@ -134,4 +136,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml index 9e65db067..5270b7acb 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToBiWeekly.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -104,4 +106,4 @@
- \ No newline at end of file + diff --git a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.xml b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.xml index d1522d546..1076542fb 100644 --- a/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.xml +++ b/airtime_mvc/tests/application/services/database/datasets/test_weeklyToNoRepeat.xml @@ -14,6 +14,7 @@ live_stream_pass linked is_linkable + image_path 1 test show @@ -28,6 +29,7 @@ 1 + @@ -84,4 +86,4 @@
- \ No newline at end of file +