bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Stephanides
2015-04-21 18:56:22 +02:00
parent d757a31e75 c6574cee00
commit 7321a63b37
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@@ -1,6 +1,8 @@
module ApplicationHelper module ApplicationHelper
def cache_array_key(array) 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 end
def clean_calendar(cal) def clean_calendar(cal)

8
app/models/fetprofile.rb
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) 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_month, "Invalides Datum")
errors.add(:birth_day, "Invalides Datum") errors.add(:birth_day, "Invalides Datum")
v= false
else
v= true
end end
end else
v= false
end
v
end end
def title def title