cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #4107 from tomhughes/diary-visibility

Browse source 
Allow administrators to see deleted diary entries
This commit is contained in:
Andy Allan 2023-08-02 14:47:05 +01:00 • committed by GitHub
commit 9619e699e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/abilities/ability.rb
View file

@ -56,7 +56,7 @@ class Ability
can [:account, :go_public], User
if user.moderator?
can [:hide, :hidecomment], DiaryEntry
can [:hide, :unhide, :hidecomment, :unhidecomment], DiaryEntry
can [:index, :show, :resolve, :ignore, :reopen], Issue
can :create, IssueComment
can [:new, :create, :edit, :update, :destroy], Redaction

4
app/controllers/diary_entries_controller.rb
View file

@ -62,7 +62,9 @@ class DiaryEntriesController < ApplicationController
end
def show
@entry = @user.diary_entries.visible.where(:id => params[:id]).first
entries = @user.diary_entries
entries = entries.visible unless can? :unhide, DiaryEntry
@entry = entries.where(:id => params[:id]).first
if @entry
@title = t ".title", :user => params[:display_name], :title => @entry.title
@comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments

34
test/controllers/diary_entries_controller_test.rb
View file

@ -680,14 +680,26 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
assert_response :not_found
# Try an entry by a suspended user
diary_entry_suspended = create(:diary_entry, :user => suspended_user)
get diary_entry_path(:display_name => suspended_user.display_name, :id => diary_entry_suspended)
diary_entry_suspended_user = create(:diary_entry, :user => suspended_user)
get diary_entry_path(:display_name => suspended_user.display_name, :id => diary_entry_suspended_user)
assert_response :not_found
# Try an entry by a deleted user
diary_entry_deleted = create(:diary_entry, :user => deleted_user)
get diary_entry_path(:display_name => deleted_user.display_name, :id => diary_entry_deleted)
diary_entry_deleted_user = create(:diary_entry, :user => deleted_user)
get diary_entry_path(:display_name => deleted_user.display_name, :id => diary_entry_deleted_user)
assert_response :not_found
# Now try as a moderator
session_for(create(:moderator_user))
get diary_entry_path(:display_name => user.display_name, :id => diary_entry_deleted)
assert_response :success
assert_template :show
# Finally try as an administrator
session_for(create(:administrator_user))
get diary_entry_path(:display_name => user.display_name, :id => diary_entry_deleted)
assert_response :success
assert_template :show
end
def test_show_hidden_comments
@ -764,8 +776,11 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
session_for(create(:moderator_user))
post unhide_diary_entry_path(:display_name => user.display_name, :id => diary_entry)
assert_response :redirect
assert_redirected_to :controller => :errors, :action => :forbidden
assert_not DiaryEntry.find(diary_entry.id).visible
assert_redirected_to :action => :index, :display_name => user.display_name
assert DiaryEntry.find(diary_entry.id).visible
# Reset
diary_entry.reload.update(:visible => true)
# Finally try as an administrator
session_for(create(:administrator_user))
@ -831,8 +846,11 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
session_for(create(:moderator_user))
post unhide_diary_comment_path(:display_name => user.display_name, :id => diary_entry, :comment => diary_comment)
assert_response :redirect
assert_redirected_to :controller => :errors, :action => :forbidden
assert_not DiaryComment.find(diary_comment.id).visible
assert_redirected_to :action => :show, :display_name => user.display_name, :id => diary_entry.id
assert DiaryComment.find(diary_comment.id).visible
# Reset
diary_comment.reload.update(:visible => true)
# Finally try as an administrator
session_for(create(:administrator_user))