htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove code to delete all comments on one line and restore default delete route for comments

Browse Source
This commit is contained in:
Maximilian Grundke
2017-08-25 18:15:02 +02:00
parent 771793f32e
commit 6aaa0f3bca
3 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/comments_controller.rb
View File

@ -1,5 +1,5 @@
class CommentsController < ApplicationController class CommentsController < ApplicationController
before_action :set_comment, only: [:show, :edit, :update, :destroy_by_id] before_action :set_comment, only: [:show, :edit, :update, :destroy]
# to disable authorization check: comment the line below back in # to disable authorization check: comment the line below back in
# skip_after_action :verify_authorized # skip_after_action :verify_authorized
@ -84,7 +84,8 @@ class CommentsController < ApplicationController
# DELETE /comments/1 # DELETE /comments/1
# DELETE /comments/1.json # DELETE /comments/1.json
def destroy_by_id def destroy
authorize!
@comment.destroy @comment.destroy
respond_to do |format| respond_to do |format|
format.html { head :no_content, notice: 'Comment was successfully destroyed.' } format.html { head :no_content, notice: 'Comment was successfully destroyed.' }
@ -92,16 +93,6 @@ class CommentsController < ApplicationController
end end
end end
def destroy
@comments = Comment.where(file_id: params[:file_id], row: params[:row], user: current_user)
@comments.each { |comment| authorize comment; comment.destroy }
respond_to do |format|
#format.html { redirect_to comments_url, notice: 'Comments were successfully destroyed.' }
format.html { head :no_content, notice: 'Comments were successfully destroyed.' }
format.json { head :no_content }
end
end
private private
# Use callbacks to share common setup or constraints between actions. # Use callbacks to share common setup or constraints between actions.
def set_comment def set_comment

6
app/policies/comment_policy.rb
View File

@ -12,14 +12,10 @@ class CommentPolicy < ApplicationPolicy
everyone everyone
end end
[:new?, :destroy?, :update?].each do |action| [:new?, :destroy?, :update?, :edit?].each do |action|
define_method(action) { admin? || author? } define_method(action) { admin? || author? }
end end
def edit?
admin?
end
def index? def index?
everyone everyone
end end

6
config/routes.rb
View File

@ -14,11 +14,7 @@ Rails.application.routes.draw do
post :set_thank_you_note post :set_thank_you_note
end end
end end
resources :comments, except: [:destroy] do resources :comments
collection do
delete :destroy
end
end
get '/my_request_for_comments', as: 'my_request_for_comments', to: 'request_for_comments#get_my_comment_requests' get '/my_request_for_comments', as: 'my_request_for_comments', to: 'request_for_comments#get_my_comment_requests'
get '/my_rfc_activity', as: 'my_rfc_activity', to: 'request_for_comments#get_rfcs_with_my_comments' get '/my_rfc_activity', as: 'my_rfc_activity', to: 'request_for_comments#get_rfcs_with_my_comments'