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

Hot Fixes

Browse Source
This commit is contained in:
Andreas Stephanides
2015-06-21 16:01:01 +02:00
parent b0f1a2823f
commit 308b542caa
9 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,7 @@
<% 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 %>
<%= render 'calendars/calentries', :object=>@calentries %>
<% end %>
<% if current_user.has_role?(:fetuser) %>
<% if !current_user.nil? and current_user.has_role?(:fetuser) %>
<%= link_to calendars_url(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid) , calendars_path(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid)%>
<% end %>
</div>

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

@@ -52,7 +52,7 @@
<%= render 'calendars/calentries', :object=>@calentries %>
<% end %>
<% end %>
<% if current_user.has_role?(:fetuser) %>
<% if !current_user.nil? and current_user.has_role?(:fetuser) %>
<%= link_to calendar_url(@rubrik.calendar,:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid) , calendars_path(:format=>:ics, :key=>Key.find_or_create(current_user,1).uuid)%>
<% end %>