andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into stable-production

Browse Source
This commit is contained in:
Andreas Stephanides
2018-05-14 21:14:40 +02:00
parent 745c4413f4 28906eb5fb
commit 1b91d99b24
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/rubriken/index.html.erb
View File

@@ -33,7 +33,7 @@
</div> </div>
</div> </div>
<% unless @calentries.nil? or @calentries.empty? or True%> <% unless @calentries.nil? or @calentries.empty? or true%>
<div class="span3"> <div class="span3">
<% unless @calentries.nil? or @calentries.empty? %> <% unless @calentries.nil? or @calentries.empty? %>
<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %> <% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>