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

Merge remote-tracking branch 'origin/documentmeeting' into documentmeeting

Browse Source 
Conflicts:
	app/controllers/documents_controller.rb
	app/controllers/meetings_controller.rb
	app/models/ability.rb
	app/models/document.rb
	app/models/meeting.rb
	app/models/meetingtyp.rb
	app/views/documents/_document.html.erb
	app/views/documents/_nested_form.html.erb
	app/views/documents/edit.js.erb
	app/views/documents/new.js.erb
	app/views/meetings/_meeting.html.erb
	app/views/themen/_small.html.erb
	config/routes.rb
This commit is contained in:
Andreas Stephanides
2014-12-16 09:00:43 +01:00
parent 07944bce89 741a3abb6d
commit 881df624b3
13 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@
<%= raw(frage.text) %>
</p>
<% end %>
<<<<<<< HEAD
<% if can?(:edit,small) || !small.meetings.empty? %>
<b>Treffen/Sitzungen</b>
<%= link_to "Neues Meeting", new_meeting_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
@@ -33,13 +34,30 @@
<%= link_to "Neues Dokument", new_document_path(:parent_id=>small.id, :parent_type=>"Thema"), :remote=>true %>
<div id="<%= Document.new_divid_for(small) %>"></div>
<% unless small.meetings.empty? %>
<b>Treffen/Sitzungen</b>
<% small.meetings.each do |m| %>
<%= render m %>
<% end%>
<% end%>
<% unless small.documents.empty? %>
<b>Dokumente</b>
<% small.documents.each do |d| %>
<%= render d %>
<% end%>
<% end%>
<% end %>
<% unless small.hideattachment %>
<%= render partial: "themen/attachment_list", object: small.attachments, locals:{editor: false} unless small.attachments.empty? %>
<% end %>