github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-04-25 14:14:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Handle href admin sidebar links better (#31575)

Browse Source 
Admin sidebar links can have either a `href` or a
`route`, and the admin search was not handling
this properly. Also, we should always use `getURL()`
on the href in case the link is internal, for subfolder
sites.

This is hard to test right now, I plan on adding more extensive
links for admin-search-data-source in another PR.
This commit is contained in:
Martin Brennan 2025-03-04 13:38:49 +10:00 committed by GitHub
parent 879faa82b3
commit b329eac79a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/admin/addon/services/admin-search-data-source.js
View File

@ -111,10 +111,14 @@ export default class AdminSearchDataSource extends Service {
#addPageLink(mapItem, link, parentLabel = "") {
let url;
if (link.routeModels) {
url = this.router.urlFor(link.route, ...link.routeModels);
} else {
url = this.router.urlFor(link.route);
if (link.route) {
if (link.routeModels) {
url = this.router.urlFor(link.route, ...link.routeModels);
} else {
url = this.router.urlFor(link.route);
}
} else if (link.href) {
url = getURL(link.href);
}
const mapItemLabel = this.#labelOrText(mapItem);

4
app/assets/javascripts/discourse/app/lib/sidebar/admin-sidebar.js
View File

@ -48,7 +48,9 @@ class SidebarAdminSectionLink extends BaseCustomSidebarSectionLink {
}
get href() {
return this.adminSidebarNavLink.href;
if (this.adminSidebarNavLink.href) {
return getURL(this.adminSidebarNavLink.href);
}
}
get query() {