IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-16 18:24:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Post time query filter not set correctly when loaded from params.

Browse Source 
https://meta.discourse.org/t/before-and-after-are-not-implemented-right-in-search/92515
This commit is contained in:
Guo Xiang Tan 2018-08-23 14:05:12 +08:00
parent cbd9045c6b
commit bd66fbef7f
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/assets/javascripts/discourse/components/search-advanced-options.js.es6
View File

@ -38,6 +38,7 @@ export default Em.Component.extend({
{ name: I18n.t("search.advanced.filters.tracking"), value: "tracking" },
{ name: I18n.t("search.advanced.filters.bookmarks"), value: "bookmarks" }
],
inOptionsForAll: [
{ name: I18n.t("search.advanced.filters.first"), value: "first" },
{ name: I18n.t("search.advanced.filters.pinned"), value: "pinned" },
@ -45,6 +46,7 @@ export default Em.Component.extend({
{ name: I18n.t("search.advanced.filters.wiki"), value: "wiki" },
{ name: I18n.t("search.advanced.filters.images"), value: "images" }
],
statusOptions: [
{ name: I18n.t("search.advanced.statuses.open"), value: "open" },
{ name: I18n.t("search.advanced.statuses.closed"), value: "closed" },
@ -55,6 +57,7 @@ export default Em.Component.extend({
value: "single_user"
}
],
postTimeOptions: [
{ name: I18n.t("search.advanced.post.time.before"), value: "before" },
{ name: I18n.t("search.advanced.post.time.after"), value: "after" }
@ -116,29 +119,36 @@ export default Em.Component.extend({
this.setSearchedTermValueForGroup();
this.setSearchedTermValueForBadge();
this.setSearchedTermValueForTags();
this.setSearchedTermValue(
"searchedTerms.in",
REGEXP_IN_PREFIX,
REGEXP_IN_MATCH
);
this.setSearchedTermSpecialInValue(
"searchedTerms.special.in.likes",
REGEXP_SPECIAL_IN_LIKES_MATCH
);
this.setSearchedTermSpecialInValue(
"searchedTerms.special.in.title",
REGEXP_SPECIAL_IN_TITLE_MATCH
);
this.setSearchedTermSpecialInValue(
"searchedTerms.special.in.private",
REGEXP_SPECIAL_IN_PRIVATE_MATCH
);
this.setSearchedTermSpecialInValue(
"searchedTerms.special.in.seen",
REGEXP_SPECIAL_IN_SEEN_MATCH
);
this.setSearchedTermValue("searchedTerms.status", REGEXP_STATUS_PREFIX);
this.setSearchedTermValueForPostTime();
this.setSearchedTermValue(
"searchedTerms.min_post_count",
REGEXP_MIN_POST_COUNT_PREFIX
@ -304,14 +314,17 @@ export default Em.Component.extend({
const userInputWhen = match[0].match(REGEXP_POST_TIME_WHEN)[0];
const existingInputDays = this.get("searchedTerms.time.days");
const userInputDays = match[0].replace(REGEXP_POST_TIME_PREFIX, "");
const properties = {};
if (existingInputWhen !== userInputWhen) {
this.set("searchedTerms.time.when", userInputWhen);
properties["searchedTerms.time.when"] = userInputWhen;
}
if (existingInputDays !== userInputDays) {
this.set("searchedTerms.time.days", userInputDays);
properties["searchedTerms.time.days"] = userInputDays;
}
this.setProperties(properties);
} else {
this.set("searchedTerms.time.days", "");
}

9
test/javascripts/acceptance/search-full-test.js.es6
View File

@ -354,6 +354,14 @@ QUnit.test("update status through advanced search ui", async assert => {
});
QUnit.test("update post time through advanced search ui", async assert => {
await visit("/search?expanded=true&q=after:2018-08-22");
assert.equal(
find(".search-query").val(),
"after:2018-08-22",
"it should update the search term correctly"
);
const postTimeSelector = selectKit(
".search-advanced-options .select-kit#postTime"
);
@ -369,6 +377,7 @@ QUnit.test("update post time through advanced search ui", async assert => {
postTimeSelector.rowByName("after").exists(),
'has "after" populated'
);
assert.equal(
find(".search-query").val(),
"none after:2016-10-05",