mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-02 14:37:49 +02:00
Code Issues Releases Wiki Activity

Fix tag page mismatches if accents/capitalizations differ in slug (#161)

Browse Source 
Fixes flarum/core#3286
This commit is contained in:
David Sevilla Martin
2022-03-10 15:06:50 -05:00
committed by GitHub
parent a82060945e
commit 671b3f4e54
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/tags/js/src/forum/addTagFilter.js
View File

@@ -6,6 +6,8 @@ import classList from 'flarum/utils/classList';
import TagHero from './components/TagHero'; import TagHero from './components/TagHero';
const findTag = slug => app.store.all('tags').find(tag => tag.slug().localeCompare(slug, undefined, { sensitivity: 'base' }) === 0);
export default function() { export default function() {
IndexPage.prototype.currentTag = function() { IndexPage.prototype.currentTag = function() {
if (this.currentActiveTag) { if (this.currentActiveTag) {
@@ -16,18 +18,26 @@ export default function() {
let tag = null; let tag = null;
if (slug) { if (slug) {
tag = app.store.getBy('tags', 'slug', slug); tag = findTag(slug);
} }
if (slug && !tag || (tag && !tag.isChild() && !tag.children())) { if (slug && !tag || (tag && !tag.isChild() && !tag.children())) {
if (this.currentTagLoading) {
return;
}
this.currentTagLoading = true;
// Unlike the backend, no need to fetch parent.children because if we're on // Unlike the backend, no need to fetch parent.children because if we're on
// a child tag page, then either: // a child tag page, then either:
// - We loaded in that child tag (and its siblings) in the API document // - We loaded in that child tag (and its siblings) in the API document
// - We first navigated to the current tag's parent, which would have loaded in the current tag's siblings. // - We first navigated to the current tag's parent, which would have loaded in the current tag's siblings.
app.store.find('tags', slug, { include: 'children,children.parent,parent,state'}).then(() => { app.store.find('tags', slug, { include: 'children,children.parent,parent,state'}).then(() => {
this.currentActiveTag = app.store.getBy('tags', 'slug', slug); this.currentActiveTag = findTag(slug);
m.redraw(); m.redraw();
}).finally(() => {
this.currentTagLoading = false;
}); });
} }