Merge branch 'master' of git://github.com/shawnpwalsh/Project-Pier

phpfreak · Nov 1, 2012 · e6b0f4d · e6b0f4d
2 parents f3f1a78 + 9aa2c64
commit e6b0f4d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/application/controllers/AccountController.class.php b/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(),

diff --git a/application/controllers/ContactsController.class.php b/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(),

diff --git a/application/plugins/files/views/add_revision.php b/application/plugins/files/views/add_revision.php
@@ -14,6 +14,7 @@
 <?php } // if ?>
 <h2><?php echo lang('file');  ?>: <?php echo $file->getObjectName(true); ?></h2>
 <form action="<?php echo $file->getAddRevisionUrl() ?>" method="post" enctype="multipart/form-data">
+  <?php tpl_display(get_template_path('form_errors')) ?>
   <div id="fileRevisionComment">
     <?php echo label_tag(lang('revision comment'), 'fileRevisionComment') ?>
     <?php echo textarea_field('revision[comment]', array_var($revision_data, 'comment'), array('class' => 'short', 'id' => 'fileRevisionComment')) ?>

diff --git a/application/views/contacts/add_contact.php b/application/views/contacts/add_contact.php
@@ -124,6 +124,11 @@
     <?php echo text_field('contact[email]', array_var($contact_data, 'email'), array('class' => 'long', 'id' => 'contactFormEmail')) ?>
   </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>

diff --git a/application/views/user/add_user.php b/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>