Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas-dev' into saas-stream-settings

Browse source 
Conflicts:
	airtime_mvc/application/models/Preference.php
This commit is contained in:
Duncan Sommerville 2015-07-10 10:29:38 -04:00
commit 37ed35f5b2
16 changed files with 94 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/controllers/IndexController.php
View file

@ -27,6 +27,12 @@ class IndexController extends Zend_Controller_Action
$this->view->stationUrl = Application_Common_HTTPHelper::getStationUrl();
$displayRadioPageLoginButtonValue = Application_Model_Preference::getRadioPageDisplayLoginButton();
if ($displayRadioPageLoginButtonValue == "") {
$displayRadioPageLoginButtonValue = true;
}
$this->view->displayLoginButton = $displayRadioPageLoginButtonValue;
}
public function mainAction()

1
airtime_mvc/application/controllers/PreferenceController.php
View file

@ -47,6 +47,7 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetDefaultLocale($values["locale"]);
Application_Model_Preference::SetDefaultTimezone($values["timezone"]);
Application_Model_Preference::SetWeekStartDay($values["weekStartDay"]);
Application_Model_Preference::setRadioPageDisplayLoginButton($values["radioPageLoginButton"]);
$logoUploadElement = $form->getSubForm('preferences_general')->getElement('stationLogo');
$logoUploadElement->receive();

1
airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.14/upgrade.sql
View file

@ -1,4 +1,3 @@
ALTER TABLE cc_pref ALTER COLUMN subjid SET NULL;
ALTER TABLE cc_pref ALTER COLUMN subjid SET DEFAULT NULL;
CREATE UNIQUE INDEX cc_pref_key_idx ON cc_pref (keystr) WHERE subjid IS NULL;
ANALYZE cc_pref;