From 03342e164bfccc94c18aec17a5b46dac7f314311 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Fri, 25 Sep 2015 13:24:12 +0200 Subject: [PATCH 1/3] ignores in moderation the admin restored proposals --- app/controllers/admin/proposals_controller.rb | 1 + spec/features/admin/proposals_spec.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/admin/proposals_controller.rb b/app/controllers/admin/proposals_controller.rb index 57e8809e2..e7c4934fa 100644 --- a/app/controllers/admin/proposals_controller.rb +++ b/app/controllers/admin/proposals_controller.rb @@ -14,6 +14,7 @@ class Admin::ProposalsController < Admin::BaseController def restore @proposal.restore + @proposal.ignore_flag Activity.log(current_user, :restore, @proposal) redirect_to request.query_parameters.merge(action: :index) end diff --git a/spec/features/admin/proposals_spec.rb b/spec/features/admin/proposals_spec.rb index a2ac86de7..be859c3e6 100644 --- a/spec/features/admin/proposals_spec.rb +++ b/spec/features/admin/proposals_spec.rb @@ -28,6 +28,7 @@ feature 'Admin proposals' do expect(page).to_not have_content(proposal.title) expect(proposal.reload).to_not be_hidden + expect(proposal).to be_ignored_flag end scenario 'Confirm hide' do From 13fc4e5a3ddd04778298f383c9d630f7c1094ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Fri, 25 Sep 2015 13:24:22 +0200 Subject: [PATCH 2/3] ignores in moderation the admin restored debates --- app/controllers/admin/debates_controller.rb | 1 + spec/features/admin/debates_spec.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/admin/debates_controller.rb b/app/controllers/admin/debates_controller.rb index 41e5af848..2bb0cb8fd 100644 --- a/app/controllers/admin/debates_controller.rb +++ b/app/controllers/admin/debates_controller.rb @@ -14,6 +14,7 @@ class Admin::DebatesController < Admin::BaseController def restore @debate.restore + @debate.ignore_flag Activity.log(current_user, :restore, @debate) redirect_to request.query_parameters.merge(action: :index) end diff --git a/spec/features/admin/debates_spec.rb b/spec/features/admin/debates_spec.rb index bccd3429c..f529b4a8f 100644 --- a/spec/features/admin/debates_spec.rb +++ b/spec/features/admin/debates_spec.rb @@ -16,6 +16,7 @@ feature 'Admin debates' do expect(page).to_not have_content(debate.title) expect(debate.reload).to_not be_hidden + expect(debate).to be_ignored_flag end scenario 'Confirm hide' do From 0dc9224ce6db2693691ce3dd060b649c5cbf36ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Fri, 25 Sep 2015 13:24:34 +0200 Subject: [PATCH 3/3] ignores in moderation the admin restored comments --- app/controllers/admin/comments_controller.rb | 1 + spec/features/admin/comments_spec.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb index 3a9c360f5..a0272f367 100644 --- a/app/controllers/admin/comments_controller.rb +++ b/app/controllers/admin/comments_controller.rb @@ -14,6 +14,7 @@ class Admin::CommentsController < Admin::BaseController def restore @comment.restore + @comment.ignore_flag Activity.log(current_user, :restore, @comment) redirect_to request.query_parameters.merge(action: :index) end diff --git a/spec/features/admin/comments_spec.rb b/spec/features/admin/comments_spec.rb index ffb8122d2..d6369272a 100644 --- a/spec/features/admin/comments_spec.rb +++ b/spec/features/admin/comments_spec.rb @@ -35,6 +35,7 @@ feature 'Admin comments' do expect(page).to_not have_content(comment.body) expect(comment.reload).to_not be_hidden + expect(comment).to be_ignored_flag end scenario "Confirm hide" do