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

FIX: set selected duration to relative time picker component (#26997) 

When the duration of relative time picker change we should update the input argument too.
This commit is contained in:
Vinoth Kannan 2024-05-13 17:48:46 +08:00 committed by GitHub
parent 334e8c0fcb
commit 262393282d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/components/relative-time-picker.gjs
View File

@ -125,7 +125,7 @@ export default class RelativeTimePicker extends Component {
} }
calculateMinutes(duration, interval) { calculateMinutes(duration, interval) {
if (isBlank(duration)) { if (isBlank(duration) || isNaN(duration)) {
return null; return null;
} }

1
app/assets/javascripts/discourse/app/components/time-shortcut-picker.hbs
View File

@ -41,6 +41,7 @@
</label> </label>
<RelativeTimePicker <RelativeTimePicker
@id="bookmark-relative-time-picker" @id="bookmark-relative-time-picker"
@durationMinutes={{this.selectedDurationMins}}
@onChange={{action "relativeTimeChanged"}} @onChange={{action "relativeTimeChanged"}}
/> />
</div> </div>

6
app/assets/javascripts/discourse/app/components/time-shortcut-picker.js
View File

@ -52,6 +52,7 @@ export default Component.extend({
selectedDate: null, selectedDate: null,
selectedDatetime: null, selectedDatetime: null,
prefilledDatetime: null, prefilledDatetime: null,
selectedDurationMins: null,
hiddenOptions: null, hiddenOptions: null,
customOptions: null, customOptions: null,
@ -208,7 +209,10 @@ export default Component.extend({
relativeTimeChanged(relativeTimeMins) { relativeTimeChanged(relativeTimeMins) {
let dateTime = now(this.userTimezone).add(relativeTimeMins, "minutes"); let dateTime = now(this.userTimezone).add(relativeTimeMins, "minutes");
this.set("selectedDatetime", dateTime); this.setProperties({
selectedDurationMins: relativeTimeMins,
selectedDatetime: dateTime,
});
if (this.onTimeSelected) { if (this.onTimeSelected) {
this.onTimeSelected(TIME_SHORTCUT_TYPES.RELATIVE, dateTime); this.onTimeSelected(TIME_SHORTCUT_TYPES.RELATIVE, dateTime);