github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 16:46:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Blank user messages inbox dropdown on subfolder setup. (#21356)

Browse Source 
This commit fixes a bug on subfolder setups where the user messages
inbox dropdown will always be blank. This is because we were comparing
URLs using values from `router.currentURL` and `router.urlFor` where
`router.currentURL` does not include `router.rootURL` while
`router.urlFor` does.
This commit is contained in:
Alan Guo Xiang Tan 2023-05-04 06:18:05 +08:00 committed by GitHub
parent b46899e5fa
commit c636fcf4fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/controllers/user-private-messages.js
View File

@ -41,10 +41,12 @@ export default class extends Controller {
get messagesDropdownValue() {
let value;
const currentURL = this.router.currentURL.toLowerCase();
for (let i = this.messagesDropdownContent.length - 1; i >= 0; i--) {
const row = this.messagesDropdownContent[i];
if (this.router.currentURL.toLowerCase().includes(row.id)) {
if (currentURL.includes(row.id.replace(this.router.rootURL, "/"))) {
value = row.id;
break;
}

21
app/assets/javascripts/discourse/tests/acceptance/user-private-messages-test.js
View File

@ -45,6 +45,27 @@ acceptance(
);
});
test("viewing group messages on subfolder setup", async function (assert) {
const router = this.container.lookup("router:main");
const originalRootURL = router.rootURL;
try {
router.set("rootURL", "/forum/");
await visit("/forum/u/eviltrout/messages");
const messagesDropdown = selectKit(".user-nav-messages-dropdown");
assert.strictEqual(
messagesDropdown.header().name(),
I18n.t("user.messages.inbox"),
"User personal inbox is selected in dropdown"
);
} finally {
router.set("rootURL", originalRootURL);
}
});
test("viewing messages of another user", async function (assert) {
updateCurrentUser({ id: 5, username: "charlie" });