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

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

app/controllers/documents_controller.rb

@@ -9,7 +9,6 @@ class DocumentsController < ApplicationController
   def new
     @document=Document.new
     @parent=params[:parent_type].constantize.find(params[:parent_id])
-    
     @document.parent=@parent
 
     @document.typ = 1
@@ -19,7 +18,10 @@ class DocumentsController < ApplicationController
   end
   def edit
     @document = Document.find(params[:id])
+<<<<<<< HEAD
     @parent=@document.parent
+=======
+>>>>>>> origin/documentmeeting
     respond_to do |format|
        format.js
     end
@@ -28,7 +30,11 @@ class DocumentsController < ApplicationController
 
   def create
     @document = Document.new(params[:document])
+<<<<<<< HEAD
     @parent=@document.parent
+=======
+
+>>>>>>> origin/documentmeeting
     respond_to do |format|
       if @document.save
        # format.html { redirect_to @document, notice: 'Document was successfully created.' }
@@ -42,9 +48,15 @@ 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.' }
@@ -60,7 +72,10 @@ class DocumentsController < ApplicationController
   def destroy
     logger.info("-------------delete------------------")
     @document = Document.find(params[:id])
+<<<<<<< HEAD
     @parent=@document.parent
+=======
+>>>>>>> origin/documentmeeting
     @document_id = params[:id]  
    
     @document.destroy

app/controllers/meetings_controller.rb

@@ -2,6 +2,7 @@ class MeetingsController < ApplicationController
 
 
 
+
  # load_and_authorize_resource
   def index
     parent=params[:parent_type].constantize.find(params[:parent_id])
@@ -66,6 +67,7 @@ end
   end
   def edit
     @meeting = Meeting.find(params[:id])
+
 @parent=@meeting.parent    
 respond_to do |format|
        format.js
@@ -75,9 +77,10 @@ respond_to do |format|
 
   def create
     @meeting = Meeting.new(params[:meeting])
+
     @parent=@meeting.parent
     #@meeting.assign_attributes(params[:meeting])
-    
+
     respond_to do |format|
       if @meeting.save
        # format.html { redirect_to @meeting, notice: 'Meeting was successfully created.' }
@@ -92,6 +95,7 @@ respond_to do |format|
   end
 
 def update
+
   @meeting = Meeting.find(params[:id])
   @parent=@meeting.parent
     respond_to do |format|
@@ -100,6 +104,7 @@ def update
         format.json { head :no_content }
         format.js
       else
+
      #   format.html 
     #    format.json { render json: @meeting.errors, status: :unprocessable_entity }
         format.js { render action: "edit" }
@@ -109,6 +114,7 @@ def update
   def destroy
     logger.info("-------------delete------------------")
     @meeting = Meeting.find(params[:id])
+
     @parent=@meeting.parent
     @meeting_id = params[:id]  
     @meeting.destroy

app/models/ability.rb

@@ -116,6 +116,7 @@ class Ability
       cannot :delete, Neuigkeit
     end
     # Calendar
+
     if( user.has_role?("fetuser") || user.has_role?("fetadmin"))
       can :manage, Document
       can :manage, Meeting

app/models/document.rb

@@ -1,10 +1,13 @@
 class Document < ActiveRecord::Base
+
   attr_accessible :etherpadkey, :name, :parent, :text, :typ, :parent_id, :parent_type
+
   belongs_to :parent, :polymorphic => true
   validate :name, :length=>{minimum:3}
   validate :text, :presence=>true
   validate :typ, :presence=>true
   validate :parent, :presence=>true
+
   def self.new_divid_for(parent)
     "document_new_parent_" + parent.class.to_s + "_" + parent.id.to_s 
   end

app/models/meeting.rb

@@ -1,6 +1,7 @@
 class Meeting < ActiveRecord::Base
   belongs_to :parent, :polymorphic=>true
   belongs_to :meetingtyp
+
   attr_accessible :desc, :intern, :name, :parent_id, :parent_type, :calentry,:calentry_attributes, :meetingtyp_id
 
   belongs_to :neuigkeit
@@ -60,6 +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
@@ -68,4 +70,6 @@ class Meeting < ActiveRecord::Base
   end
 
 
+=======
+>>>>>>> origin/documentmeeting
 end

app/models/meetingtyp.rb

@@ -2,4 +2,5 @@ class Meetingtyp < ActiveRecord::Base
   attr_accessible :agendaintern, :desc, :name, :protocolintern
   belongs_to :rubrik
   validate :rubrik, :presence=>true
+
 end

app/views/documents/_document.html.erb

@@ -1,7 +1,9 @@
 <div class="contentbox" id="document_<%= document.id%>">
   <% image_tag("/iconnavy/time.png")  %>
+
   <%= fa_icon("file-text") %>
 <%= link_to document.name, document %>
+
   <%= link_to "edit", edit_document_path(document),:remote=>true if can? :edit, document %>
   <%= link_to 'Delete', document, method: :delete, data: { confirm: 'Are you sure?' } , remote: true if can? :delete, document %>
 </div>

app/views/documents/_nested_form.html.erb

@@ -4,8 +4,10 @@
 <%= semantic_form_for @document, :remote=>true, :html=>{:class=>""} do |f| %>
 
  <%= f.input :name  %>
+
 <%= f.input :parent_id, :as=>:hidden  %>
 <%= f.input :parent_type, :as=>:hidden %>
+
  <%= f.action :submit, :as => :input_ %>
  
 <% end %>

app/views/documents/edit.js.erb

@@ -1,5 +1,7 @@
+
 $("#<%= @document.divid %>").html("<%=escape_javascript( render :partial=>"nested_form" ,:object=>@document)%>");
 
 
 
+
   

app/views/documents/new.js.erb

@@ -1,3 +1,5 @@
+
 $("#<%= Document.new_divid_for(@parent) %>").replaceWith("<div id=\"<%= Document.new_divid_for(@parent) %>\"><%=escape_javascript( render :partial=>"nested_form" ,:object=>@document) %></div>");
 
+
   

app/views/meetings/_meeting.html.erb

@@ -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>
 
+

app/views/themen/_small.html.erb

@@ -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 %>

config/routes.rb

@@ -166,10 +166,14 @@ Fetsite::Application.routes.draw do
       resources :documents 
       resources :meetings do
         member do
+
           get :announce
           get :create_protocol
           get :create_agenda 
         end
+
+      end
+
       end
       resources :meetingtyps
     end