merge errors

app/controllers/documents_controller.rb

@@ -18,10 +18,9 @@ class DocumentsController < ApplicationController
   end
   def edit
     @document = Document.find(params[:id])
-<<<<<<< HEAD
+
     @parent=@document.parent
-=======
+
->>>>>>> origin/documentmeeting
     respond_to do |format|
        format.js
     end
@@ -30,11 +29,9 @@ class DocumentsController < ApplicationController
 
   def create
     @document = Document.new(params[:document])
-<<<<<<< HEAD
-    @parent=@document.parent
-=======
 
->>>>>>> origin/documentmeeting
+    @parent=@document.parent
+
     respond_to do |format|
       if @document.save
        # format.html { redirect_to @document, notice: 'Document was successfully created.' }
@@ -48,15 +45,11 @@ class DocumentsController < ApplicationController
     end
   end
 
-<<<<<<< HEAD
+
   def update
     @document = Document.find(params[:id])
     @parent=@document.parent
-=======
-def update
-    @document = Document.find(params[:id])
 
->>>>>>> origin/documentmeeting
     respond_to do |format|
       if @document.update_attributes(params[:document])
         format.html { redirect_to @document, notice: 'Document was successfully updated.' }
@@ -72,10 +65,9 @@ def update
   def destroy
     logger.info("-------------delete------------------")
     @document = Document.find(params[:id])
-<<<<<<< HEAD
+
     @parent=@document.parent
-=======
+
->>>>>>> origin/documentmeeting
     @document_id = params[:id]  
    
     @document.destroy

app/models/meeting.rb

@@ -61,7 +61,7 @@ class Meeting < ActiveRecord::Base
       self.agenda=d
     end
   end
-<<<<<<< HEAD
+
   def self.new_divid_for(parent)
     "meeting_new_parent_" + parent.class.to_s + "_" + parent.id.to_s 
   end
@@ -70,6 +70,5 @@ class Meeting < ActiveRecord::Base
   end
 
 
-=======
+
->>>>>>> origin/documentmeeting
 end

app/views/themen/_small.html.erb

@@ -20,7 +20,8 @@
   <%= 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 %>
@@ -29,30 +30,22 @@
 <%= link_to "upcomming", meetings_path(:parent_id=>small.id, :parent_type=>"Thema",:filter=>"upcomming"), :remote=>true %>
 <%= render :partial=>"meetings/meeting_list", object: small.meetings, locals: {parent: small} %>
 <% end %>
+
+
 <% if can?(:edit,small)|| ! small.documents.empty? %>
+
 <b>Dokumente</b>
 <%= 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%>
 
 
 

config/routes.rb

@@ -166,7 +166,6 @@ Fetsite::Application.routes.draw do
       resources :documents 
       resources :meetings do
         member do
-
           get :announce
           get :create_protocol
           get :create_agenda 
@@ -174,7 +173,7 @@ Fetsite::Application.routes.draw do
         
       end
       
-      end
+    
       resources :meetingtyps
     end
   end