Changeset 115

Timestamp:

06/13/08 23:17:03 (5 months ago)

Author:

jweiss

Message:

more TimeZone? changes

Location:

trunk

Files:

• app/controllers/application.rb (modified) (1 diff)
• app/views/deployments/_status.html.erb (modified) (1 diff)
• app/views/users/_form.html.erb (modified) (1 diff)
• app/views/users/show.html.erb (modified) (1 diff)
• config/environment.rb (modified) (1 diff)

trunk/app/controllers/application.rb

@@ -19 +19 @@
   
   def set_timezone
-    # default timezone is UTC (Edinburgh)
-    Time.zone = logged_in? ? ( current_user.tz rescue TimeZone['Edinburgh']): TimeZone['Edinburgh']
+    # default timezone is UTC
+    Time.zone = logged_in? ? ( current_user.time_zone rescue 'UTC'): 'UTC'
     yield
-    Time.zone = TimeZone['Edinburgh']
+    Time.zone = 'UTC'
   end
   

trunk/app/views/deployments/_status.html.erb

@@ -27 +27 @@
         <p>
           <b>Started:</b>
-          <%=h @deployment.created_at.to_s(:log) %>
+          <%=h @deployment.created_at.to_s(:log) %> (<%=h current_user.time_zone rescue 'UTC' %>)
         </p>
   <p>
           <b>Completed:</b>
-          <%=h @deployment.completed_at.to_s(:log) rescue nil %>
+          <%=h "#{@deployment.completed_at.to_s(:log)} (#{current_user.time_zone})" rescue nil %>
         </p>
         <% if @deployment.completed? %>

trunk/app/views/users/_form.html.erb

@@ -22 +22 @@
 <p>
   <b>Timezone</b><br />
-  <%= time_zone_select 'user', 'time_zone', TZInfo::Timezone.all.sort, {:model => TZInfo::Timezone},{:style => "width:330px;"} %>
+  <%= time_zone_select 'user', :time_zone, TimeZone.all, {},{:style => "width:330px;"} %>
 </p>
 

trunk/app/views/users/show.html.erb

@@ -31 +31 @@
       
                         <p>
-                          <b>Timezone:</b> <%=h @user.tz.to_s %>
+                          <b>Timezone:</b> <%=h @user.time_zone.to_s %>
                         </p>
                         <p>

trunk/config/environment.rb

@@ -100 +100 @@
 # set default time_zone to UTC
 ENV['TZ'] = 'UTC'
-Time.zone = TimeZone['Edinburgh']
+Time.zone = 'UTC'