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

CC-6127 - Add 'Use station default' option to user settings timezone, don't set user timezone by default when creating the admin user

Browse source
This commit is contained in:
Duncan Sommerville 2015-09-01 16:10:33 -04:00
parent a99bc26715
commit 37df86723d
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/common/Timezone.php
View file

@ -18,7 +18,7 @@ class Application_Common_Timezone
'UTC' => DateTimeZone::UTC 'UTC' => DateTimeZone::UTC
); );
$tzlist = array(); $tzlist = array(NULL => "Use station default");
foreach ($regions as $name => $mask) { foreach ($regions as $name => $mask) {
$ids = DateTimeZone::listIdentifiers($mask); $ids = DateTimeZone::listIdentifiers($mask);

7
airtime_mvc/application/forms/EditUser.php
View file

@ -121,11 +121,14 @@ class Application_Form_EditUser extends Zend_Form
$locale->setValue(Application_Model_Preference::GetUserLocale($currentUserId)); $locale->setValue(Application_Model_Preference::GetUserLocale($currentUserId));
$locale->setDecorators(array('ViewHelper')); $locale->setDecorators(array('ViewHelper'));
$this->addElement($locale); $this->addElement($locale);
$stationTz = Application_Model_Preference::GetTimezone($currentUserId);
$userTz = Application_Model_Preference::GetUserTimezone($currentUserId);
$timezone = new Zend_Form_Element_Select("cu_timezone"); $timezone = new Zend_Form_Element_Select("cu_timezone");
$timezone->setLabel(_("Interface Timezone:")); $timezone->setLabel(_("Interface Timezone:"));
$timezone->setMultiOptions(Application_Common_Timezone::getTimezones()); $timezone->setMultiOptions(Application_Common_Timezone::getTimezones());
$timezone->setValue(Application_Model_Preference::GetUserTimezone($currentUserId)); $timezone->setValue($userTz == $stationTz ? null : $userTz);
$timezone->setDecorators(array('ViewHelper')); $timezone->setDecorators(array('ViewHelper'));
$this->addElement($timezone); $this->addElement($timezone);

10
airtime_mvc/application/models/Preference.php
View file

@ -477,10 +477,6 @@ class Application_Model_Preference
public static function SetUserTimezone($timezone = null) public static function SetUserTimezone($timezone = null)
{ {
// When a new user is created they will get the default timezone
// setting which the admin sets on preferences page
if (is_null($timezone))
$timezone = self::GetDefaultTimezone();
self::setValue("user_timezone", $timezone, true); self::setValue("user_timezone", $timezone, true);
} }
@ -520,10 +516,10 @@ class Application_Model_Preference
public static function GetUserLocale() public static function GetUserLocale()
{ {
$locale = self::getValue("user_locale", true); $locale = self::getValue("user_locale", true);
if (!$locale) { // empty() checks for null and empty strings - more robust than !val
if (empty($locale)) {
return self::GetDefaultLocale(); return self::GetDefaultLocale();
} } else {
else {
return $locale; return $locale;
} }
} }

4
airtime_mvc/build/sql/defaultdata.sql
View file

@ -353,7 +353,9 @@ INSERT INTO cc_locale (locale_code, locale_lang) VALUES ('zh_CN', '简体中文'
-- added in 2.5.2 -- added in 2.5.2
INSERT INTO cc_pref (keystr, valstr) VALUES ('timezone', 'UTC'); INSERT INTO cc_pref (keystr, valstr) VALUES ('timezone', 'UTC');
INSERT INTO cc_pref (subjid, keystr, valstr) VALUES (1, 'user_timezone', 'UTC'); -- We don't want to set the user timezone by default - it should instead use the station timezone
-- until the user changes it manually.
-- INSERT INTO cc_pref (subjid, keystr, valstr) VALUES (1, 'user_timezone', 'UTC');
INSERT INTO cc_pref (keystr, valstr) VALUES ('import_timestamp', '0'); INSERT INTO cc_pref (keystr, valstr) VALUES ('import_timestamp', '0');