CC-4816: Timezones should be a user preference
-done
This commit is contained in:
parent
f887ca3d8d
commit
db62b538dd
9 changed files with 98 additions and 46 deletions
|
@ -12,7 +12,8 @@ class Application_Form_EditUser extends Zend_Form
|
|||
* */
|
||||
|
||||
$currentUser = Application_Model_User::getCurrentUser();
|
||||
$userData = Application_Model_User::GetUserData($currentUser->getId());
|
||||
$currentUserId = $currentUser->getId();
|
||||
$userData = Application_Model_User::GetUserData($currentUserId);
|
||||
$notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator();
|
||||
$emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator();
|
||||
|
||||
|
@ -100,17 +101,16 @@ class Application_Form_EditUser extends Zend_Form
|
|||
$locale = new Zend_Form_Element_Select("cu_locale");
|
||||
$locale->setLabel(_("Language:"));
|
||||
$locale->setMultiOptions(Application_Model_Locale::getLocales());
|
||||
$locale->setValue(Application_Model_Preference::GetUserLocale($currentUser->getId()));
|
||||
$locale->setValue(Application_Model_Preference::GetUserLocale($currentUserId));
|
||||
$locale->setDecorators(array('ViewHelper'));
|
||||
$this->addElement($locale);
|
||||
/*
|
||||
$saveBtn = new Zend_Form_Element_Button('cu_save_user');
|
||||
$saveBtn->setAttrib('class', 'btn btn-small right-floated');
|
||||
$saveBtn->setIgnore(true);
|
||||
$saveBtn->setLabel(_('Save'));
|
||||
$saveBtn->setDecorators(array('viewHelper'));
|
||||
$this->addElement($saveBtn);
|
||||
*/
|
||||
|
||||
$timezone = new Zend_Form_Element_Select("cu_timezone");
|
||||
$timezone->setLabel(_("Timezone:"));
|
||||
$timezone->setMultiOptions(Application_Common_Timezone::getTimezones());
|
||||
$timezone->setValue(Application_Model_Preference::GetUserTimezone($currentUserId));
|
||||
$timezone->setDecorators(array('ViewHelper'));
|
||||
$this->addElement($timezone);
|
||||
}
|
||||
|
||||
public function validateLogin($p_login, $p_userId) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue