- {{d-button action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}}
-
-
- {{i18n 'admin.logs.staff_actions.instructions'}}
+
+ {{d-button action="exportStaffActionLogs" label="admin.export_csv.button_text" icon="download"}}
+
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index c8f6b350d31..a25115a6912 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -1305,10 +1305,6 @@ table.api-keys {
}
}
-.staff-action-logs-instructions {
- margin: 0 0 10px 10px;
-}
-
// Ember.ListView
.ember-list-view {
diff --git a/app/controllers/admin/staff_action_logs_controller.rb b/app/controllers/admin/staff_action_logs_controller.rb
index b004601014f..242cc4f4027 100644
--- a/app/controllers/admin/staff_action_logs_controller.rb
+++ b/app/controllers/admin/staff_action_logs_controller.rb
@@ -2,8 +2,12 @@ class Admin::StaffActionLogsController < Admin::AdminController
def index
filters = params.slice(*UserHistory.staff_filters)
+
staff_action_logs = UserHistory.staff_action_records(current_user, filters).to_a
- render_serialized(staff_action_logs, UserHistorySerializer)
+ render json: StaffActionLogsSerializer.new({
+ staff_action_logs: staff_action_logs,
+ user_history_actions: UserHistory.staff_actions.sort.map{|name| {id: UserHistory.actions[name], name: name}}
+ }, root: false)
end
def diff
diff --git a/app/serializers/staff_action_logs_serializer.rb b/app/serializers/staff_action_logs_serializer.rb
new file mode 100644
index 00000000000..ea887cb4a8e
--- /dev/null
+++ b/app/serializers/staff_action_logs_serializer.rb
@@ -0,0 +1,12 @@
+class StaffActionLogsSerializer < ApplicationSerializer
+ attributes :user_history_actions
+ has_many :staff_action_logs, serializer: UserHistorySerializer, embed: :objects
+
+ def staff_action_logs
+ object[:staff_action_logs]
+ end
+
+ def user_history_actions
+ object[:user_history_actions]
+ end
+end
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 425d20e219c..673c0d08000 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3025,8 +3025,9 @@ en:
block: "block"
do_nothing: "do nothing"
staff_actions:
+ all: "all"
+ filter: "Filter:"
title: "Staff Actions"
- instructions: "Click usernames and actions to filter the list. Click profile pictures to go to user pages."
clear_filters: "Show Everything"
staff_user: "Staff User"
target_user: "Target User"
@@ -3079,6 +3080,8 @@ en:
change_readonly_mode: "change readonly mode"
backup_download: "download backup"
backup_destroy: "destroy backup"
+ reviewed_post: "reviewed post"
+ custom_staff: "plugin custom action"
screened_emails:
title: "Screened Emails"
description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed."
diff --git a/spec/controllers/admin/staff_action_logs_controller_spec.rb b/spec/controllers/admin/staff_action_logs_controller_spec.rb
index 697a58ab4e6..2712d2f8137 100644
--- a/spec/controllers/admin/staff_action_logs_controller_spec.rb
+++ b/spec/controllers/admin/staff_action_logs_controller_spec.rb
@@ -9,10 +9,21 @@ describe Admin::StaffActionLogsController do
context '.index' do
- it 'works' do
- xhr :get, :index
+ it 'generates logs' do
+
+ topic = Fabricate(:topic)
+ _record = StaffActionLogger.new(Discourse.system_user).log_topic_deletion(topic)
+
+ xhr :get, :index, action_id: UserHistory.actions[:delete_topic]
+
+ json = JSON.parse(response.body)
expect(response).to be_success
- expect(::JSON.parse(response.body)).to be_a(Array)
+
+ expect(json["staff_action_logs"].length).to eq(1)
+ expect(json["staff_action_logs"][0]["action_name"]).to eq("delete_topic")
+
+ expect(json["user_history_actions"]).to include({"id" => UserHistory.actions[:delete_topic], "name" => 'delete_topic'})
+
end
end