From dd5b479c5d93ce6d600b13818bd7ddc8bc7f2422 Mon Sep 17 00:00:00 2001
From: Reinier Balt <lrbalt@gmail.com>
Date: Tue, 7 Apr 2009 21:34:15 +0200
Subject: [PATCH] fix #584 where the date at the top did not use the users
 timezone, but the servers timezone

also remove confusing user_time helper
---
 app/helpers/application_helper.rb    | 6 +-----
 app/helpers/todos_helper.rb          | 6 +++---
 app/views/layouts/mobile.m.erb       | 2 +-
 app/views/layouts/standard.html.erb  | 2 +-
 app/views/preferences/index.html.erb | 6 +++---
 app/views/todos/_edit_mobile.rhtml   | 2 +-
 6 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ff01fcae..61ad8209 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,10 +2,6 @@
 # application.
 module ApplicationHelper
   
-  def user_time
-    Time.zone.now
-  end
-  
   # Replicates the link_to method but also checks request.request_uri to find
   # current page. If that matches the url, the link is marked id = "current"
   #
@@ -24,7 +20,7 @@ module ApplicationHelper
   end
   
   def days_from_today(date)
-    date.in_time_zone.to_date - user_time.to_date
+    date.in_time_zone.to_date - current_user.time.to_date
   end
   
   # Check due date in comparison to today's date Flag up date appropriately with
diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 61e79a8c..8e1aa83e 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -161,11 +161,11 @@ module TodosHelper
   def staleness_class(item)
     if item.due || item.completed?
       return ""
-    elsif item.created_at < user_time - (prefs.staleness_starts * 3).days
+    elsif item.created_at < current_user.time - (prefs.staleness_starts * 3).days
       return " stale_l3"
-    elsif item.created_at < user_time - (prefs.staleness_starts * 2).days
+    elsif item.created_at < current_user.time - (prefs.staleness_starts * 2).days
       return " stale_l2"
-    elsif item.created_at < user_time - (prefs.staleness_starts).days
+    elsif item.created_at < current_user.time - (prefs.staleness_starts).days
       return " stale_l1"
     else
       return ""
diff --git a/app/views/layouts/mobile.m.erb b/app/views/layouts/mobile.m.erb
index 3ee740a5..d23a83e3 100644
--- a/app/views/layouts/mobile.m.erb
+++ b/app/views/layouts/mobile.m.erb
@@ -14,7 +14,7 @@
 <% if !(@new_mobile || @edit_mobile)
       if !@prefs.nil? -%>
 <h1><span class="count"><%= @down_count %></span> <%= 
-        user_time.strftime(@prefs.title_date_format) -%></h1>
+        current_user.time.strftime(@prefs.title_date_format) -%></h1>
 <div class="nav">
 <%=     (link_to("0-New action", formatted_new_todo_path(:m, new_todo_params))+" | ") unless @new_mobile -%>
 <%=     (link_to("1-Home", formatted_todos_path(:m))+" | ") unless @home -%>
diff --git a/app/views/layouts/standard.html.erb b/app/views/layouts/standard.html.erb
index 2326a047..ebe415d9 100644
--- a/app/views/layouts/standard.html.erb
+++ b/app/views/layouts/standard.html.erb
@@ -31,7 +31,7 @@
           <% if @count -%>
             <span id="badge_count" class="badge"><%= @count %></span>
           <% end -%>
-          <%= user_time.strftime(@prefs.title_date_format) %>
+          <%= current_user.time.strftime(@prefs.title_date_format) %>
         </h1>
       </div>
       <div id="minilinks">
diff --git a/app/views/preferences/index.html.erb b/app/views/preferences/index.html.erb
index 05c90a86..aab4d384 100644
--- a/app/views/preferences/index.html.erb
+++ b/app/views/preferences/index.html.erb
@@ -5,9 +5,9 @@
   <ul id="prefs">
     <li>First name: <span class="highlight"><%= current_user.first_name %></span></li>
     <li>Last name: <span class="highlight"><%= current_user.last_name %></span></li>
-    <li>Date format: <span class="highlight"><%= prefs.date_format %></span> Your current date: <%= format_date(user_time) %></li>
-    <li>Title date format: <span class="highlight"><%= prefs.title_date_format %></span> Your current title date: <%= user_time.strftime(prefs.title_date_format) %></li>
-    <li>Time zone: <span class="highlight"><%= prefs.time_zone %></span> Your current time: <%= user_time.strftime('%I:%M %p') %></li>
+    <li>Date format: <span class="highlight"><%= prefs.date_format %></span> Your current date: <%= format_date(current_user.time) %></li>
+    <li>Title date format: <span class="highlight"><%= prefs.title_date_format %></span> Your current title date: <%= current_user.time.strftime(prefs.title_date_format) %></li>
+    <li>Time zone: <span class="highlight"><%= prefs.time_zone %></span> Your current time: <%= current_user.time.strftime('%I:%M %p') %></li>
     <li>Week starts on: <span class="highlight"><%= Preference.day_number_to_name_map[prefs.week_starts] %></span></li>
     <li>Show the last <span class="highlight"><%= prefs.show_number_completed %></span> completed items</li>
     <li>Show completed projects in sidebar: <span class="highlight"><%= prefs.show_completed_projects_in_sidebar %></span></li>
diff --git a/app/views/todos/_edit_mobile.rhtml b/app/views/todos/_edit_mobile.rhtml
index 75abb40f..0c39945d 100644
--- a/app/views/todos/_edit_mobile.rhtml
+++ b/app/views/todos/_edit_mobile.rhtml
@@ -3,7 +3,7 @@
 <span class="errors">
 <%= error_messages_for("todo") %>
 </span>
-<% this_year = user_time.to_date.strftime("%Y").to_i
+<% this_year = current_user.time.to_date.strftime("%Y").to_i
 if parent_container_type == 'show_mobile' -%>
 <p><label for="todo_done">Done?</label>&nbsp;<%= check_box_tag("done", 1, @todo && @todo.completed?, "tabindex" => 1) %></p>
 <% end -%>