IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 09:26:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: show all staff events related to the target user

Browse Source
This commit is contained in:
Arpit Jalan 2017-02-22 13:31:40 +05:30
parent b32f33b3f0
commit 213a496203
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/routes/admin-user-index.js.es6
View File

@ -33,7 +33,7 @@ export default Discourse.Route.extend({
viewActionLogs(username) {
const controller = this.controllerFor('adminLogs.staffActionLogs');
this.transitionTo('adminLogs.staffActionLogs').then(() => {
controller._changeFilters({ acting_user: username });
controller._changeFilters({ target_user: username });
});
}
}

2
lib/guardian.rb
View File

@ -159,7 +159,7 @@ class Guardian
end
def can_view_action_logs?(target)
is_staff? && target && target.staff?
is_staff? && target
end
# Can we approve it?

8
spec/components/guardian_spec.rb
View File

@ -289,12 +289,8 @@ describe Guardian do
expect(Guardian.new(moderator).can_view_action_logs?(nil)).to be_falsey
end
it 'is false for non-staff target user' do
expect(Guardian.new(moderator).can_view_action_logs?(user)).to be_falsey
end
it 'is true for staff target user' do
expect(Guardian.new(moderator).can_view_action_logs?(admin)).to be_truthy
it 'is true when target user is present' do
expect(Guardian.new(moderator).can_view_action_logs?(user)).to be_truthy
end
end