bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

AutoCommit Sam Aug 1 23:03:02 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-08-01 23:03:02 +02:00
parent 2b01a87d15
commit 9933718750
8 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/controllers/comments_controller.rb
View File

@@ -6,36 +6,26 @@ before_filter :decode_commentable_type
@comments=@commentable.comments.order(:created_at).roots.page(params[:page]).per(Comment::NUM[params[:commentable_type]]).reverse_order
respond_to do |format|
format.html # new.html.erb
format.json { render json: @comment }
format.js
end
end
def hide
@commentable=params[:commentable_type].constantize.find(params[:commentable_id]) unless params[:commentable_type].nil? or params[:commentable_id].nil?
@commentable=params[:commentable_type].constantize.find(params[:commentable_id]) unless params[:commentable_type].nil? or params[:commentable_id].nil?
respond_to do |format|
format.js
end
end
end
def show
@comment = Comment.find(params[:id])
respond_to do |format|
# format.html # show.html.erb
format.js
format.json { render json: @comment }
end
end
def new
@comment = Comment.new
@comment.commentable=params[:commentable_type].constantize.find(params[:commentable_id]) unless params[:commentable_type].nil? or params[:commentable_id].nil?
respond_to do |format|
format.html # new.html.erb
format.json { render json: @comment }
format.js
end
end
@@ -53,19 +43,16 @@ before_filter :decode_commentable_type
c = params[:comment][:commentable_type].constantize.find(params[:comment][:commentable_id]) unless params[:comment][:commentable_type].nil? or params[:comment][:commentable_id].nil?
@comment = Comment.build_for(c, current_user,"", params_new)
if @comment.parent_object.class==Comment
@comments= @comment.parent_object.children
else
@comments=@comment.parent_object.comments.order(:created_at).roots.page(params[:page]).per(Comment::NUM[params[:commentable_type]]).reverse_order
end
@comments= @comment.parent_object.children
else
@comments=@comment.parent_object.comments.order(:created_at).roots.page(params[:page]).per(Comment::NUM[params[:commentable_type]]).reverse_order
end
respond_to do |format|
if @comment
format.html { redirect_to @comment.commentable, notice: 'Comment was successfully created.', show_comments: true }
format.json { render json: @comment, status: :created, location: @comment }
format.js
else
format.html { render action: "new" }
format.json { render json: @comment.errors, status: :unprocessable_entity }
format.js {render action:"new"}
end
end
@@ -95,13 +82,10 @@ end
def destroy
@comment = Comment.find(params[:id])
@commentable=@comment.commentable
@comment.destroy
@comments=@commentable.comments.order(:created_at).roots.page(params[:page]).per(Comment::NUM[params[:commentable_type]]).reverse_order
respond_to do |format|
format.html { redirect_to @commentable, :action=>"show"}
format.json { head :no_content }
format.js
end
end