Merge branch 'master' of fet.at:~/fetsite

This commit is contained in:
Andreas Stephanides
2015-08-07 17:23:16 +02:00

View File

@@ -103,6 +103,7 @@
<% if @beispiele_deleted.count > 0 %> <% if @beispiele_deleted.count > 0 %>
<h3> Trash</h3> <h3> Trash</h3>
<% @beispiele_deleted.each do |b| %> <% @beispiele_deleted.each do |b| %>
<% cache("beispiel_" +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s + "_" + b.updated_at.try(:utc).try(:to_s) + get_theme_help(current_user).to_s) do %> <% cache("beispiel_" +I18n.locale.to_s+b.id.to_s+can?(:delete,b).to_s+"_"+can?(:edit,b).to_s + "_" + can?(:flag, b).to_s + "_" + can?(:like, b).to_s + "_" + b.updated_at.try(:utc).try(:to_s) + get_theme_help(current_user).to_s) do %>
<%= render b%> <%= render b%>
<% end %> <% end %>