github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 11:35:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Allow HTML in grant admin dialog (#20133)

Browse Source 
In a private plugin, we need to show an error message containing HTML
when the Grant Admin action fails. This change introduces a new flag
(`html_message: true`) that when used will allow the dialog to render
the HTML tags in the error message correctly.
This commit is contained in:
Penar Musaraj 2023-02-02 09:09:25 -05:00 committed by GitHub
parent 54f165beae
commit 6bbf832400
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/admin/addon/controllers/admin-user-index.js
View File

@ -232,7 +232,14 @@ export default Controller.extend(CanCheckEmails, {
queryParams: { nonce },
});
} else {
popupAjaxError(error);
const htmlMessage = error.jqXHR?.responseJSON.html_message;
if (htmlMessage) {
this.dialog.alert({
message: htmlSafe(error.jqXHR?.responseJSON.error),
});
} else {
popupAjaxError(error);
}
}
});
},

34
app/assets/javascripts/discourse/tests/acceptance/admin-user-index-test.js
View File

@ -123,6 +123,27 @@ acceptance("Admin - User Index", function (needs) {
return helper.response({});
});
server.get("/admin/users/6.json", () => {
return helper.response({
id: 6,
username: "user6",
name: null,
avatar_template: "/letter_avatar_proxy/v4/letter/b/f0a364/{size}.png",
active: true,
admin: false,
moderator: false,
can_grant_admin: true,
can_revoke_admin: false,
});
});
server.put("/admin/users/6/grant_admin", () => {
return helper.response(403, {
error: "A message with <strong>bold</strong> text.",
html_message: true,
});
});
});
needs.hooks.beforeEach(() => {
@ -222,7 +243,7 @@ acceptance("Admin - User Index", function (needs) {
);
});
test("grant admin - shows the confirmation bootbox", async function (assert) {
test("grant admin - shows the confirmation dialog", async function (assert) {
await visit("/admin/users/3/user1");
await click(".grant-admin");
assert.ok(exists(".dialog-content"));
@ -234,6 +255,17 @@ acceptance("Admin - User Index", function (needs) {
await click(".dialog-footer .btn-primary");
});
test("grant admin - optionally allows HTML to be shown in the confirmation dialog", async function (assert) {
await visit("/admin/users/6/user6");
await click(".grant-admin");
assert.ok(exists(".dialog-content"));
assert.ok(
exists(".dialog-content .dialog-body strong"),
"HTML is rendered in the dialog"
);
});
test("grant admin - redirects to the 2fa page", async function (assert) {
await visit("/admin/users/4/user2");
await click(".grant-admin");