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

meeting fixes

Browse Source
This commit is contained in:
Andreas Stephanides
2015-02-14 17:25:51 +01:00
parent 195b982ef4
commit 14ebb13bc1
7 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/themen/_small.html.erb
View File

@@ -27,8 +27,10 @@
<b>Treffen/Sitzungen</b>
<%= link_to "Neues Meeting", new_meeting_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
<div id="<%= Meeting.new_divid_for(small) %>"></div>
<%= link_to "All", meetings_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
<%= link_to "upcomming", meetings_path(:parent_id=>small.id, :parent_type=>"Thema",:filter=>"upcomming"), :remote=>true %>
<ul class="nav nav-tabs">
<li><%= link_to "All", meetings_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true if small.meetings.accessible_by(current_ability).count >0 %></li>
<li><%= link_to "upcomming", meetings_path(:parent_id=>small.id, :parent_type=>"Thema",:filter=>"upcomming"), :remote=>true if small.meetings.accessible_by(current_ability).upcomming.count >0 %></li>
</ul>
<%= render :partial=>"meetings/meeting_list", object: small.meetings, locals: {parent: small} %>
<% end %>

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

@@ -10,7 +10,7 @@
}
%>
<%=
<%
unless @thema.titlepics.first.nil?
picture_url=URI(root_url)
picture_url.path=@thema.titlepics.first.datei.url(:locale=>nil, :theme=>nil)