AutoCommit Fre Jul 31 23:03:01 CEST 2015

app/controllers/comments_controller.rb

@@ -1,7 +1,8 @@
 class CommentsController < ApplicationController
   def index
     @commentable=params[:commentable_type].constantize.find(params[:commentable_id]) unless params[:commentable_type].nil? or params[:commentable_id].nil?
-    @comments=@commentable.comments.order(:created_at).roots.page(params[:page]).per(2).reverse_order
+num = {"Beispiel"=> 2, "Survey::Question"=> 7} 
+   @comments=@commentable.comments.order(:created_at).roots.page(params[:page]).per(num[params[:commentable_type]]).reverse_order
     respond_to do |format|
       format.html # new.html.erb
       format.json { render json: @comment }
@@ -84,12 +85,13 @@ class CommentsController < ApplicationController
   def destroy
     @comment = Comment.find(params[:id])
     @commentable=@comment.commentable
+    @divid=@comment.divid
     @comment.destroy
 
     respond_to do |format|
       format.html { redirect_to @commentable, :action=>"show"}
       format.json { head :no_content }
-    
+      format.js
     end
   end
 end

app/models/comment.rb

@@ -43,9 +43,9 @@ class Comment < ActiveRecord::Base
     "comment_" + id.to_s
   end
   def formid
-"comment_form_" + commentable_type.gsub(":","_") + "_" + commentable_id.to_s 
+    "comment_form_" + commentable_type.gsub(":","_") + "_" + commentable_id.to_s 
   end
   def self.formid_for(c)
     "comment_form_" + c.class.to_s.gsub(":","_") + "_" + c.id.to_s 
-    end
+  end
 end

app/views/comments/_comment.html.erb

@@ -1,19 +1,17 @@
 <div id="<%= comment.divid %>">
   <a class="pull-left media-object" href="#"><%= image_tag comment.thumb_url %></a>
   <div class="media-body"> 
+		<b><%= (!comment.anonym) ? comment.user.try(:email) : "Anonym" %></b> (<%= I18n.l(comment.created_at) %>) 
+		<%= link_to ffi1_icon("remove9"), comment, method: :delete, data: { confirm: 'Are you sure?' }, remote: true %>: 
+		<p>
+			<%= comment.text %>
+			<% if can?(:comment, comment.commentable) %>
+				<br><%= link_to "comment" , new_comment_path( commentable_type: "Comment", commentable_id: comment.id), remote:true  %>  
+			<% end %>
+		</p>
+		<div id="<%= Comment.formid_for(comment) %>">
+		</div>
 
- <b><%= (!comment.anonym) ? comment.user.try(:email) : "Anonym" %></b> (<%= I18n.l(comment.created_at) %>) <%= link_to ffi1_icon("remove9"), comment, method: :delete, data: { confirm: 'Are you sure?' } %>: 
-<p><%= comment.text %>
-<% if can?(:comment, comment.commentable) %>
-<br><%= link_to "comment" , new_comment_path( commentable_type: "Comment", commentable_id: comment.id), remote:true  %>  
-<% end %>
-</p>
-  <div id="<%= Comment.formid_for(comment) %>">
-  </div>
-
-  <%= render partial:"comments/comments", object: comment.children.order(:created_at).reverse_order  if comment.children.size >0 %>
-
-
-</div>
-  
+		<%= render partial:"comments/comments", object: comment.children.order(:created_at).reverse_order  if comment.children.size >0 %>
+	</div>
 </div>

app/views/comments/create.js.erb

@@ -0,0 +1 @@
+

app/views/comments/destroy.js.erb

@@ -0,0 +1 @@
+$('#<%= @divid %>').remove()