Avoid using Date.today, better to use Date.current that takes timezone into account

This commit is contained in:
Bertocq
2017-06-11 10:40:12 +02:00
parent 79dfdb88b4
commit e14a5b2eaf
4 changed files with 6 additions and 6 deletions

View File

@@ -41,11 +41,11 @@ module Search
end
def search_finish_date
(params[:advanced_search][:date_max].to_date rescue Date.today) || Date.today
(params[:advanced_search][:date_max].to_date rescue Date.current) || Date.current
end
def search_date_range
[100.years.ago, search_start_date].max.beginning_of_day..[search_finish_date, Date.today].min.end_of_day
[100.years.ago, search_start_date].max.beginning_of_day..[search_finish_date, Date.current].min.end_of_day
end
def set_search_order

View File

@@ -8,7 +8,7 @@ class DirectMessage < ActiveRecord::Base
validates :receiver, presence: true
validate :max_per_day
scope :today, lambda { where('DATE(created_at) = ?', Date.today) }
scope :today, lambda { where('DATE(created_at) = ?', Date.current) }
def max_per_day
return if errors.any?

View File

@@ -8,7 +8,7 @@
<%= image_tag "header_print_proposals.jpg", class: "for-print-only" %>
<div class="filters">
<span class="for-print-only date-for-print"><%= l Date.today, format: :long %></span>
<span class="for-print-only date-for-print"><%= l Date.current, format: :long %></span>
<h2 class="inline-block">
<span class="not-print"><%= t("proposals.index.select_order_long") %></span>

View File

@@ -1,7 +1,7 @@
class MigrateSpendingProposalsToInvestments
def import(sp)
budget = Budget.last || Budget.create!(name: Date.today.year.to_s, currency_symbol: "")
budget = Budget.last || Budget.create!(name: Date.current.year.to_s, currency_symbol: "")
group = nil
heading = nil