diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7bb662b..3e02421 100755 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -40,15 +40,15 @@ def get_theme - if params[:theme]== "default" || params[:theme]=="2003" - params[:theme]="blue1" - end - if ThemesForRails.available_theme_names.include?(params[:theme]) - params[:theme] +# if params[:theme]== "default" || params[:theme]=="2003" +# params[:theme]="blue1" +# end +# if ThemesForRails.available_theme_names.include?(params[:theme]) +# params[:theme] -else +#else "blue1" -end +#end end def default_url_options {locale: I18n.locale, theme: (theme_name=="blue1") ? "default" : theme_name , ansicht: nil} diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb index bf87c06..c660fa3 100644 --- a/app/views/gremien/show.html.erb +++ b/app/views/gremien/show.html.erb @@ -25,7 +25,7 @@ <% @memberships.each_slice(4) do |r| %>
<% r.each do |m| %> - <% cache("member_"+ m.id.to_s+"_portrait"+[m.updated_at m.fetprofile.updated_at].max.utc.to_s) do %> + <% cache(("member_" + m.id.to_s + "_portrait" + ([m.updated_at, m.try(:fetprofile).try(:updated_at)].max.utc.to_s))) do %> <%= link_to m.fetprofile do %>
<%= image_tag m.fetprofile.try(:picture).try(:portrait) %> diff --git a/app/views/memberships/_membership.html.erb b/app/views/memberships/_membership.html.erb index 287b442..cdeb9d9 100644 --- a/app/views/memberships/_membership.html.erb +++ b/app/views/memberships/_membership.html.erb @@ -2,7 +2,7 @@ <%= membership.stop.nil? ? I18n.t("gremium.seit")+" " : I18n.t("gremium.von")+" " %> <%=membership.start.to_s %> <%= " "+I18n.t("gremium.bis")+" "+membership.stop.to_s unless membership.stop.nil? %> -<%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %> +<%= Membership::TYPEN_g[membership.fetprofile.geschlecht.to_i][membership.typ.to_i] %> <%= membership.gremium.fall2 %>