Skip to content
Browse files

Move timezone from Account page to Contact page

Fixes issue reported by numerous users where timezone changes would not
save
http://www.projectpier.org/node/3337
http://www.projectpier.org/node/4044
  • Loading branch information...
1 parent d52a871 commit 204fcdf91a201dc322415193688ec8bec7ac59f0 @shawnpwalsh shawnpwalsh committed Oct 31, 2012
View
1 application/controllers/AccountController.class.php
@@ -76,7 +76,6 @@ function edit_profile() {
'fax_number' => $user->getFaxNumber(),
'mobile_number' => $user->getMobileNumber(),
'home_number' => $user->getHomeNumber(),
- 'timezone' => $user->getTimezone(),
'is_admin' => $user->getIsAdmin(),
'auto_assign' => $user->getAutoAssign(),
'use_LDAP' => $user->getUseLDAP(),
View
1 application/controllers/ContactsController.class.php
@@ -190,6 +190,7 @@ function edit() {
'company_id' => $contact->getCompanyId(),
'title' => $contact->getTitle(),
'email' => $contact->getEmail(),
+ 'timezone' => $contact->getTimezone(),
'office_number' => $contact->getOfficeNumber(),
'fax_number' => $contact->getFaxNumber(),
'mobile_number' => $contact->getMobileNumber(),
View
5 application/views/contacts/add_contact.php
@@ -125,6 +125,11 @@
</div>
<div>
+ <?php echo label_tag(lang('timezone'), 'contactFormTimezone', true)?>
+ <?php echo select_timezone_widget('contact[timezone]', array_var($contact_data, 'timezone'), array('id' => 'contactFormTimezone', 'class' => 'long')) ?>
+ </div>
+
+ <div>
<fieldset>
<legend><?php echo lang('avatar') ?></legend>
<?php if ($contact->hasAvatar()) { ?>
View
5 application/views/user/add_user.php
@@ -53,11 +53,6 @@
<?php echo lang('user locale desc') ?>
</div>
- <div>
- <?php echo label_tag(lang('timezone'), 'userFormTimezone', true)?>
- <?php echo select_timezone_widget('user[timezone]', array_var($user_data, 'timezone'), array('id' => 'userFormTimezone', 'class' => 'long')) ?>
- </div>
-
<?php if ($user->isNew() || logged_user()->isAdministrator()) { ?>
<fieldset>
<legend><?php echo lang('password') ?></legend>

0 comments on commit 204fcdf

Please sign in to comment.
Something went wrong with that request. Please try again.