bofh/fetsite
9
0
Fork 1
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

2
app/views/meetings/_meeting.html.erb
View File

@@ -1,4 +1,5 @@
<div class="contentbox" id="meeting_<%= meeting.id%>">
<b><%= link_to meeting.text, meeting %></b>
<%= link_to "Ankündigung", rubrik_neuigkeit_path(meeting.neuigkeit.rubrik, meeting.neuigkeit) unless meeting.neuigkeit.nil? %>
<%= link_to "ankündigen", announce_meeting_path(meeting), remote: true if meeting.neuigkeit.nil? %>
@@ -11,3 +12,4 @@
<%= render meeting.protocol unless meeting.protocol.nil? %>
</div>