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

Revert "FIX: tag dropdown not working with default_list_filter (#20608)" (#20631) 

This reverts commit 0df7743d78.

This causes too much instability in the unit test system, reverting
This commit is contained in:
Sam 2023-03-10 13:45:34 +11:00 committed by GitHub
parent 118ce348f4
commit 5893ad46ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/app/lib/url.js
View File

@ -506,12 +506,9 @@ export function getCategoryAndTagUrl(category, subcategories, tag) {
if (category) { if (category) {
url = category.path; url = category.path;
if (subcategories && (category.default_list_filter === "none" || tag)) { if (subcategories && category.default_list_filter === "none") {
url += "/all"; url += "/all";
} else if ( } else if (!subcategories && category.default_list_filter === "all") {
!subcategories &&
(category.default_list_filter === "all" || tag)
) {
url += "/none"; url += "/none";
} }
} }

28
app/assets/javascripts/discourse/tests/unit/lib/url-test.js
View File

@ -141,34 +141,6 @@ module("Unit | Utility | url", function () {
), ),
"/c/foo/1" "/c/foo/1"
); );
assert.strictEqual(
getCategoryAndTagUrl(
{ path: "/c/foo/1", default_list_filter: "none" },
false,
"bar"
),
"/tags/c/foo/1/none/bar"
);
assert.strictEqual(
getCategoryAndTagUrl({ path: "/c/foo/1" }, false, "bar"),
"/tags/c/foo/1/none/bar"
);
assert.strictEqual(
getCategoryAndTagUrl(
{ path: "/c/foo/1", default_list_filter: "all" },
true,
"bar"
),
"/tags/c/foo/1/all/bar"
);
assert.strictEqual(
getCategoryAndTagUrl({ path: "/c/foo/1" }, true, "bar"),
"/tags/c/foo/1/all/bar"
);
}); });
test("routeTo redirects secure uploads URLS because they are server side only", async function (assert) { test("routeTo redirects secure uploads URLS because they are server side only", async function (assert) {