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

feat: move timezone preference to config file (#2096)

Browse source 
BREAKING CHANGE: The timezone preference moved to the configuration
file.
This commit is contained in:
Jonas L 2022-09-14 12:48:08 +02:00 • committed by GitHub
parent 8ef82d798e
commit 9b3207b8a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 73 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
legacy/application/configs/conf.php
View file

@ -36,6 +36,11 @@ class Schema implements ConfigurationInterface
/**/->scalarNode('public_url')->cannotBeEmpty()->end()
/**/->scalarNode('api_key')->cannotBeEmpty()->end()
/**/->arrayNode('allowed_cors_origins')->scalarPrototype()->defaultValue([])->end()->end()
/**/->scalarNode('timezone')->cannotBeEmpty()->defaultValue("UTC")
/* */->validate()->ifNotInArray(DateTimeZone::listIdentifiers())
/* */->thenInvalid('invalid general.timezone %s')
/* */->end()
/**/->end()
/**/->scalarNode('dev_env')->defaultValue('production')->end()
/**/->scalarNode('auth')->defaultValue('local')->end()
/**/->integerNode('cache_ahead_hours')->defaultValue(1)->end()

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

@ -50,7 +50,6 @@ class PreferenceController extends Zend_Controller_Action
Application_Model_Preference::SetAllow3rdPartyApi($values['thirdPartyApi']);
Application_Model_Preference::SetAllowedCorsUrls($values['allowedCorsUrls']);
Application_Model_Preference::SetDefaultLocale($values['locale']);
Application_Model_Preference::SetDefaultTimezone($values['timezone']);
Application_Model_Preference::SetWeekStartDay($values['weekStartDay']);
Application_Model_Preference::setRadioPageDisplayLoginButton($values['radioPageLoginButton']);
Application_Model_Preference::SetFeaturePreviewMode($values['featurePreviewMode']);

1
legacy/application/controllers/SetupController.php
View file

@ -25,7 +25,6 @@ class SetupController extends Zend_Controller_Action
$currentUserId = $currentUser->getDbId();
Application_Model_Preference::SetUserTimezone($formData['setup_timezone'], $currentUserId);
Application_Model_Preference::SetDefaultTimezone($formData['setup_timezone']);
Application_Model_Preference::SetUserLocale($formData['setup_language'], $currentUserId);
Application_Model_Preference::SetDefaultLocale($formData['setup_language']);

1
legacy/application/forms/GeneralPreferences.php
View file

@ -187,6 +187,7 @@ class Application_Form_GeneralPreferences extends Zend_Form_SubForm
// Form Element for setting the Timezone
$timezone = new Zend_Form_Element_Select('timezone');
$timezone->setLabel(_('Station Timezone'));
$timezone->setAttrib('disabled', 'true');
$timezone->setMultiOptions(Application_Common_Timezone::getTimezones());
$timezone->setValue(Application_Model_Preference::GetDefaultTimezone());
$this->addElement($timezone);

13
legacy/application/models/Preference.php
View file

@ -536,21 +536,10 @@ class Application_Model_Preference
return sprintf(_('Powered by %s'), SAAS_PRODUCT_BRANDING_NAME);
}
// Sets station default timezone (from preferences)
public static function SetDefaultTimezone($timezone)
{
self::setValue('timezone', $timezone);
}
// Returns station default timezone (from preferences)
public static function GetDefaultTimezone()
{
$stationTimezone = self::getValue('timezone');
if (is_null($stationTimezone) || $stationTimezone == '') {
$stationTimezone = 'UTC';
}
return $stationTimezone;
return Config::get('general.timezone');
}
public static function SetUserTimezone($timezone = null)