diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7d6fae6..b205f3e 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,7 +1,9 @@ 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 - end +# 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) cal.rubrik.meetingtyps.each do |mt| diff --git a/app/models/fetprofile.rb b/app/models/fetprofile.rb index efbf04a..804995e 100644 --- a/app/models/fetprofile.rb +++ b/app/models/fetprofile.rb @@ -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