Merge branch 'master' of github.com:fetsite/fetsite into crawler

This commit is contained in:
Andreas Stephanides
2015-04-21 18:56:22 +02:00
2 changed files with 11 additions and 3 deletions

View File

@@ -1,6 +1,8 @@
module ApplicationHelper
def cache_array_key(array)
array.map{|c| c.id}.join('')+"_"+array.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s
# array.map{|c| c.id}.join('')+"_"+array.max{|c|c.updated_at.try(:utc)}.updated_at.try(:utc).to_s+"_"+I18n.locale.to_s
array.map{|c| c.id}.join('')+"_"+array.map{|c|c.try(:updated_at).try(:utc).to_s}.join('') +"_"+I18n.locale.to_s
end
def clean_calendar(cal)

View File

@@ -35,8 +35,14 @@ class Fetprofile < ActiveRecord::Base
unless Date.valid_date?((birth_year.nil?) ? Date.today.year : birth_year, birth_month, birth_day)
errors.add(:birth_month, "Invalides Datum")
errors.add(:birth_day, "Invalides Datum")
v= false
else
v= true
end
end
else
v= false
end
v
end
def title