Merge pull request #555 from AyuntamientoMadrid/hide-admin-restored

Hide admin restored
This commit is contained in:
Alberto García Cabeza
2015-09-25 13:40:31 +02:00
6 changed files with 6 additions and 0 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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