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

FIX: no need to hide "Later This Week" when showing "Later Today" (#16365)

This commit is contained in:
Andrei Prigorshnev 2022-04-05 12:49:05 +00:00 committed by GitHub
parent 7edc941843
commit 8a9c644021
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/lib/timeframes-builder.js
View File

@ -33,7 +33,7 @@ const TIMEFRAMES = [
buildTimeframe({ buildTimeframe({
id: "later_this_week", id: "later_this_week",
format: "ddd, h a", format: "ddd, h a",
enabled: (opts) => !opts.canScheduleToday && opts.day > 0 && opts.day < 4, enabled: (opts) => opts.day > 0 && opts.day < 4,
when: (time, timeOfDay) => time.add(2, "day").hour(timeOfDay).minute(0), when: (time, timeOfDay) => time.add(2, "day").hour(timeOfDay).minute(0),
}), }),
buildTimeframe({ buildTimeframe({

1
app/assets/javascripts/discourse/tests/acceptance/admin-silence-user-test.js
View File

@ -34,6 +34,7 @@ acceptance("Admin - Silence User", function (needs) {
const expected = [ const expected = [
I18n.t("topic.auto_update_input.later_today"), I18n.t("topic.auto_update_input.later_today"),
I18n.t("topic.auto_update_input.tomorrow"), I18n.t("topic.auto_update_input.tomorrow"),
I18n.t("topic.auto_update_input.later_this_week"),
I18n.t("topic.auto_update_input.next_week"), I18n.t("topic.auto_update_input.next_week"),
I18n.t("topic.auto_update_input.two_weeks"), I18n.t("topic.auto_update_input.two_weeks"),
I18n.t("topic.auto_update_input.next_month"), I18n.t("topic.auto_update_input.next_month"),

1
app/assets/javascripts/discourse/tests/acceptance/admin-suspend-user-test.js
View File

@ -133,6 +133,7 @@ acceptance("Admin - Suspend User - timeframe choosing", function (needs) {
const expected = [ const expected = [
I18n.t("topic.auto_update_input.later_today"), I18n.t("topic.auto_update_input.later_today"),
I18n.t("topic.auto_update_input.tomorrow"), I18n.t("topic.auto_update_input.tomorrow"),
I18n.t("topic.auto_update_input.later_this_week"),
I18n.t("topic.auto_update_input.next_week"), I18n.t("topic.auto_update_input.next_week"),
I18n.t("topic.auto_update_input.two_weeks"), I18n.t("topic.auto_update_input.two_weeks"),
I18n.t("topic.auto_update_input.next_month"), I18n.t("topic.auto_update_input.next_month"),

1
app/assets/javascripts/discourse/tests/acceptance/create-invite-modal-test.js
View File

@ -213,6 +213,7 @@ acceptance(
const expected = [ const expected = [
I18n.t("topic.auto_update_input.later_today"), I18n.t("topic.auto_update_input.later_today"),
I18n.t("topic.auto_update_input.tomorrow"), I18n.t("topic.auto_update_input.tomorrow"),
I18n.t("topic.auto_update_input.later_this_week"),
I18n.t("topic.auto_update_input.next_week"), I18n.t("topic.auto_update_input.next_week"),
I18n.t("topic.auto_update_input.two_weeks"), I18n.t("topic.auto_update_input.two_weeks"),
I18n.t("topic.auto_update_input.next_month"), I18n.t("topic.auto_update_input.next_month"),

1
app/assets/javascripts/discourse/tests/acceptance/topic-set-slow-mode-test.js
View File

@ -53,6 +53,7 @@ acceptance("Topic - Set Slow Mode", function (needs) {
const expected = [ const expected = [
I18n.t("topic.auto_update_input.later_today"), I18n.t("topic.auto_update_input.later_today"),
I18n.t("topic.auto_update_input.tomorrow"), I18n.t("topic.auto_update_input.tomorrow"),
I18n.t("topic.auto_update_input.later_this_week"),
I18n.t("topic.auto_update_input.next_week"), I18n.t("topic.auto_update_input.next_week"),
I18n.t("topic.auto_update_input.two_weeks"), I18n.t("topic.auto_update_input.two_weeks"),
I18n.t("topic.auto_update_input.next_month"), I18n.t("topic.auto_update_input.next_month"),

1
app/assets/javascripts/discourse/tests/acceptance/user-preferences-notifications-test.js
View File

@ -138,6 +138,7 @@ acceptance("User Notifications - Users - Ignore User", function (needs) {
const expected = [ const expected = [
I18n.t("topic.auto_update_input.later_today"), I18n.t("topic.auto_update_input.later_today"),
I18n.t("topic.auto_update_input.tomorrow"), I18n.t("topic.auto_update_input.tomorrow"),
I18n.t("topic.auto_update_input.later_this_week"),
I18n.t("topic.auto_update_input.this_weekend"), I18n.t("topic.auto_update_input.this_weekend"),
I18n.t("topic.auto_update_input.next_week"), I18n.t("topic.auto_update_input.next_week"),
I18n.t("topic.auto_update_input.two_weeks"), I18n.t("topic.auto_update_input.two_weeks"),

5
app/assets/javascripts/discourse/tests/unit/lib/timeframes-builder-test.js
View File

@ -32,6 +32,7 @@ module("Unit | Lib | timeframes-builder", function (hooks) {
const expected = [ const expected = [
"later_today", "later_today",
"tomorrow", "tomorrow",
"later_this_week",
"next_week", "next_week",
"two_weeks", "two_weeks",
"next_month", "next_month",
@ -112,9 +113,9 @@ module("Unit | Lib | timeframes-builder", function (hooks) {
assert.ok(timeframes.includes("later_this_week")); assert.ok(timeframes.includes("later_this_week"));
}); });
test("doesn't output 'Later This Week' on Tuesdays", function (assert) { test("doesn't output 'Later This Week' on Thursdays", function (assert) {
const timezone = moment.tz.guess(); const timezone = moment.tz.guess();
this.clock = fakeTime("2100-04-22 18:00:00", timezone, true); // Tuesday evening this.clock = fakeTime("2100-04-22 18:00:00", timezone, true); // Thursday evening
const timeframes = buildTimeframes(buildOptions(moment())).mapBy("id"); const timeframes = buildTimeframes(buildOptions(moment())).mapBy("id");
assert.notOk(timeframes.includes("later_this_week")); assert.notOk(timeframes.includes("later_this_week"));