mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: additionalOpts update and change to function (#12546)
* FIX: additionalOpts should be added outside conditional * FIX: changed the computed property to function
This commit is contained in:
parent
70970bb791
commit
ff814dcfc1
@ -45,7 +45,6 @@ export default Component.extend({
|
|||||||
return canModifyTimer && showTopicTimerModal;
|
return canModifyTimer && showTopicTimerModal;
|
||||||
},
|
},
|
||||||
|
|
||||||
@discourseComputed
|
|
||||||
additionalOpts() {
|
additionalOpts() {
|
||||||
return {};
|
return {};
|
||||||
},
|
},
|
||||||
@ -94,11 +93,11 @@ export default Component.extend({
|
|||||||
categoryName: category.get("slug"),
|
categoryName: category.get("slug"),
|
||||||
categoryUrl: category.get("url"),
|
categoryUrl: category.get("url"),
|
||||||
},
|
},
|
||||||
options,
|
options
|
||||||
this.additionalOpts
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
options = Object.assign(options, this.additionalOpts());
|
||||||
this.setProperties({
|
this.setProperties({
|
||||||
title: `${moment(this.executeAt).format("LLLL")}`.htmlSafe(),
|
title: `${moment(this.executeAt).format("LLLL")}`.htmlSafe(),
|
||||||
notice: `${I18n.t(this._noticeKey(), options)}`.htmlSafe(),
|
notice: `${I18n.t(this._noticeKey(), options)}`.htmlSafe(),
|
||||||
|
Loading…
Reference in New Issue
Block a user