Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Use `filters` parameter instead of `filter` for staff action log (#11217) 

Fixing this also means that ember takes care of JSON encoding the query parameter

Follow-up to a4441b3984
This commit is contained in:
David Taylor 2020-11-12 13:31:28 +00:00 committed by GitHub
parent 4f1bb184b1
commit 5be78bb2d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/addon/models/site-setting.js
View File

@ -11,10 +11,10 @@ const SiteSetting = EmberObject.extend(Setting, {
return; return;
} }
return JSON.stringify({ return {
subject: setting, subject: setting,
action_name: "change_site_setting", action_name: "change_site_setting",
}); };
}, },
}); });

2
app/assets/javascripts/admin/addon/templates/components/site-setting.hbs
View File

@ -1,7 +1,7 @@
<div class="setting-label"> <div class="setting-label">
<h3> <h3>
{{#if staffLogFilter}} {{#if staffLogFilter}}
{{#link-to "adminLogs.staffActionLogs" (query-params filter=staffLogFilter) title=(i18n "admin.settings.history")}} {{#link-to "adminLogs.staffActionLogs" (query-params filters=staffLogFilter) title=(i18n "admin.settings.history")}}
{{settingName}} {{settingName}}
<span class="history-icon"> <span class="history-icon">
{{d-icon "history"}} {{d-icon "history"}}

2
app/assets/javascripts/discourse/tests/acceptance/admin-site-settings-test.js
View File

@ -47,7 +47,7 @@ acceptance("Admin - Site Settings", function (needs) {
assert.equal( assert.equal(
queryAll(".row.setting .setting-label h3 a").attr("href"), queryAll(".row.setting .setting-label h3 a").attr("href"),
"/admin/logs/staff_action_logs?filter=%7B%22subject%22%3A%22title%22%2C%22action_name%22%3A%22change_site_setting%22%7D", "/admin/logs/staff_action_logs?filters=%7B%22subject%22%3A%22title%22%2C%22action_name%22%3A%22change_site_setting%22%7D",
"it links to the staff action log" "it links to the staff action log"
); );
}); });