jro_apps/redmine Commit - r9546:bc945d78a625

Merged r9719, r9726, r9727 from trunk....

Jean-Philippe Lang -

r9546:bc945d78a625

parent child

Context file:

r9546:bc945d78a625

Collapse all files

app/controllers/activities_controller.rb +1 -1

                 if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language])
                   respond_to do |format|
                     format.html {
-                      @events_by_day = events.group_by(&:event_date)
+                      @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
                       render :layout => false if request.xhr?
                     }
                     format.atom {

app/helpers/application_helper.rb +2 -2

               end
               def format_activity_day(date)
-                date == Date.today ? l(:label_today).titleize : format_date(date)
+                date == User.current.today ? l(:label_today).titleize : format_date(date)
               end
               def format_activity_description(text)
               def time_tag(time)
                 text = distance_of_time_in_words(Time.now, time)
                 if @project
-                  link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => time.to_date}, :title => format_time(time))
+                  link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)}, :title => format_time(time))
                 else
                   content_tag('acronym', text, :title => format_time(time))
                 end

app/models/query.rb +10 -4

                 s = []
                 if from
                   from_yesterday = from - 1
-                  from_yesterday_utc = Time.gm(from_yesterday.year, from_yesterday.month, from_yesterday.day)
+                  from_yesterday_time = Time.local(from_yesterday.year, from_yesterday.month, from_yesterday.day)
-                  s << ("#{table}.#{field} > '%s'" % [connection.quoted_date(from_yesterday_utc.end_of_day)])
+                  if self.class.default_timezone == :utc
+                    from_yesterday_time = from_yesterday_time.utc
+                  end
+                  s << ("#{table}.#{field} > '%s'" % [connection.quoted_date(from_yesterday_time.end_of_day)])
                 end
                 if to
-                  to_utc = Time.gm(to.year, to.month, to.day)
+                  to_time = Time.local(to.year, to.month, to.day)
-                  s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date(to_utc.end_of_day)])
+                  if self.class.default_timezone == :utc
+                    to_time = to_time.utc
+                  end
+                  s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date(to_time.end_of_day)])
                 end
                 s.join(' AND ')
               end

app/models/user.rb +9 0

@@ -370,6 +370,15 class User < Principal
370	end	370	end
371	end	371	end
372		372
		373	# Returns the day of +time+ according to user's time zone
		374	def time_to_date(time)
		375	if time_zone.nil?
		376	time.to_date
		377	else
		378	time.in_time_zone(time_zone).to_date
		379	end
		380	end
		381
373	def logged?	382	def logged?
374	true	383	true
375	end	384	end

app/models/wiki_page.rb +1 -1

                   if time = read_attribute(:updated_on)
                     # content updated_on was eager loaded with the page
                     begin
-                      @updated_on = Time.zone ? Time.zone.parse(time.to_s) : Time.parse(time.to_s)
+                      @updated_on = (self.class.default_timezone == :utc ? Time.parse(time.to_s).utc : Time.parse(time.to_s).localtime)
                     rescue
                     end
                   else

config/application.rb +1 0

                 config.active_record.observers = :message_observer, :issue_observer, :journal_observer, :news_observer, :document_observer, :wiki_content_observer, :comment_observer
                 config.active_record.store_full_sti_class = true
+                config.active_record.default_timezone = :local
                 # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
                 # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.

test/fixtures/issues.yml +24 -24

             ---
             issues_001:
-              created_on: <%= 3.days.ago.to_date.to_s(:db) %>
+              created_on: <%= 3.days.ago.to_s(:db) %>
               project_id: 1
-              updated_on: <%= 1.day.ago.to_date.to_s(:db) %>
+              updated_on: <%= 1.day.ago.to_s(:db) %>
               priority_id: 4
               subject: Can't print recipes
               id: 1
               lft: 1
               rgt: 2
             issues_004:
-              created_on: <%= 5.days.ago.to_date.to_s(:db) %>
+              created_on: <%= 5.days.ago.to_s(:db) %>
               project_id: 2
-              updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
+              updated_on: <%= 2.days.ago.to_s(:db) %>
               priority_id: 4
               subject: Issue on project 2
               id: 4
               lft: 1
               rgt: 2
             issues_005:
-              created_on: <%= 5.days.ago.to_date.to_s(:db) %>
+              created_on: <%= 5.days.ago.to_s(:db) %>
               project_id: 3
-              updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
+              updated_on: <%= 2.days.ago.to_s(:db) %>
               priority_id: 4
               subject: Subproject issue
               id: 5
               lft: 1
               rgt: 2
             issues_006:
-              created_on: <%= 1.minute.ago.to_date.to_s(:db) %>
+              created_on: <%= 1.minute.ago.to_s(:db) %>
               project_id: 5
-              updated_on: <%= 1.minute.ago.to_date.to_s(:db) %>
+              updated_on: <%= 1.minute.ago.to_s(:db) %>
               priority_id: 4
               subject: Issue of a private subproject
               id: 6
               lft: 1
               rgt: 2
             issues_007:
-              created_on: <%= 10.days.ago.to_date.to_s(:db) %>
+              created_on: <%= 10.days.ago.to_s(:db) %>
               project_id: 1
-              updated_on: <%= 10.days.ago.to_date.to_s(:db) %>
+              updated_on: <%= 10.days.ago.to_s(:db) %>
               priority_id: 5
               subject: Issue due today
               id: 7
               lft: 1
               rgt: 2
             issues_008:
-              created_on: <%= 10.days.ago.to_date.to_s(:db) %>
+              created_on: <%= 10.days.ago.to_s(:db) %>
               project_id: 1
-              updated_on: <%= 10.days.ago.to_date.to_s(:db) %>
+              updated_on: <%= 10.days.ago.to_s(:db) %>
               priority_id: 5
               subject: Closed issue
               id: 8
               lft: 1
               rgt: 2
             issues_009:
-              created_on: <%= 1.minute.ago.to_date.to_s(:db) %>
+              created_on: <%= 1.minute.ago.to_s(:db) %>
               project_id: 5
-              updated_on: <%= 1.minute.ago.to_date.to_s(:db) %>
+              updated_on: <%= 1.minute.ago.to_s(:db) %>
               priority_id: 5
               subject: Blocked Issue
               id: 9
               lft: 1
               rgt: 2
             issues_010:
-              created_on: <%= 1.minute.ago.to_date.to_s(:db) %>
+              created_on: <%= 1.minute.ago.to_s(:db) %>
               project_id: 5
-              updated_on: <%= 1.minute.ago.to_date.to_s(:db) %>
+              updated_on: <%= 1.minute.ago.to_s(:db) %>
               priority_id: 5
               subject: Issue Doing the Blocking
               id: 10
               lft: 1
               rgt: 2
             issues_011:
-              created_on: <%= 3.days.ago.to_date.to_s(:db) %>
+              created_on: <%= 3.days.ago.to_s(:db) %>
               project_id: 1
-              updated_on: <%= 1.day.ago.to_date.to_s(:db) %>
+              updated_on: <%= 1.day.ago.to_s(:db) %>
               priority_id: 5
               subject: Closed issue on a closed version
               id: 11
               lft: 1
               rgt: 2
             issues_012:
-              created_on: <%= 3.days.ago.to_date.to_s(:db) %>
+              created_on: <%= 3.days.ago.to_s(:db) %>
               project_id: 1
-              updated_on: <%= 1.day.ago.to_date.to_s(:db) %>
+              updated_on: <%= 1.day.ago.to_s(:db) %>
               priority_id: 5
               subject: Closed issue on a locked version
               id: 12
               lft: 1
               rgt: 2
             issues_013:
-              created_on: <%= 5.days.ago.to_date.to_s(:db) %>
+              created_on: <%= 5.days.ago.to_s(:db) %>
               project_id: 3
-              updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
+              updated_on: <%= 2.days.ago.to_s(:db) %>
               priority_id: 4
               subject: Subproject issue two
               id: 13
               rgt: 2
             issues_014:
               id: 14
-              created_on: <%= 15.days.ago.to_date.to_s(:db) %>
+              created_on: <%= 15.days.ago.to_s(:db) %>
               project_id: 3
-              updated_on: <%= 15.days.ago.to_date.to_s(:db) %>
+              updated_on: <%= 15.days.ago.to_s(:db) %>
               priority_id: 5
               subject: Private issue on public project
               fixed_version_id:

test/unit/user_test.rb +32 -1

@@ -424,7 +424,38 class UserTest < ActiveSupport::TestCase
424	assert_equal 'jsmith', @jsmith.reload.name	424	assert_equal 'jsmith', @jsmith.reload.name
425	end	425	end
426	end	426	end
427		427
		428	def test_today_should_return_the_day_according_to_user_time_zone
		429	preference = User.find(1).pref
		430	date = Date.new(2012, 05, 15)
		431	time = Time.gm(2012, 05, 15, 23, 30).utc # 2012-05-15 23:30 UTC
		432	Date.stubs(:today).returns(date)
		433	Time.stubs(:now).returns(time)
		434
		435	preference.update_attribute :time_zone, 'Baku' # UTC+4
		436	assert_equal '2012-05-16', User.find(1).today.to_s
		437
		438	preference.update_attribute :time_zone, 'La Paz' # UTC-4
		439	assert_equal '2012-05-15', User.find(1).today.to_s
		440
		441	preference.update_attribute :time_zone, ''
		442	assert_equal '2012-05-15', User.find(1).today.to_s
		443	end
		444
		445	def test_time_to_date_should_return_the_date_according_to_user_time_zone
		446	preference = User.find(1).pref
		447	time = Time.gm(2012, 05, 15, 23, 30).utc # 2012-05-15 23:30 UTC
		448
		449	preference.update_attribute :time_zone, 'Baku' # UTC+4
		450	assert_equal '2012-05-16', User.find(1).time_to_date(time).to_s
		451
		452	preference.update_attribute :time_zone, 'La Paz' # UTC-4
		453	assert_equal '2012-05-15', User.find(1).time_to_date(time).to_s
		454
		455	preference.update_attribute :time_zone, ''
		456	assert_equal '2012-05-15', User.find(1).time_to_date(time).to_s
		457	end
		458
428	def test_fields_for_order_statement_should_return_fields_according_user_format_setting	459	def test_fields_for_order_statement_should_return_fields_according_user_format_setting
429	with_settings :user_format => 'lastname_coma_firstname' do	460	with_settings :user_format => 'lastname_coma_firstname' do
430	assert_equal ['users.lastname', 'users.firstname', 'users.id'], User.fields_for_order_statement	461	assert_equal ['users.lastname', 'users.firstname', 'users.id'], User.fields_for_order_statement

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages