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

DEV: Temporarily hide form when editing topic with template (#22099)

Browse Source
This commit is contained in:
Keegan George 2023-06-14 11:16:39 -07:00 committed by GitHub
parent 8b39125985
commit cd6183de93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/app/components/composer-editor.hbs
View File

@ -18,6 +18,7 @@
@popupMenuOptions={{this.popupMenuOptions}} @popupMenuOptions={{this.popupMenuOptions}}
@formTemplateIds={{this.formTemplateIds}} @formTemplateIds={{this.formTemplateIds}}
@replyingToTopic={{this.composer.replyingToTopic}} @replyingToTopic={{this.composer.replyingToTopic}}
@editingPost={{this.composer.editingPost}}
@disabled={{this.disableTextarea}} @disabled={{this.disableTextarea}}
@outletArgs={{hash composer=this.composer editorType="composer"}} @outletArgs={{hash composer=this.composer editorType="composer"}}
> >

7
app/assets/javascripts/discourse/app/components/d-editor.js
View File

@ -247,9 +247,10 @@ export default Component.extend(TextareaTextManipulation, {
this.selectedFormTemplateId = formTemplateId; this.selectedFormTemplateId = formTemplateId;
}, },
@discourseComputed("formTemplateIds", "replyingToTopic") @discourseComputed("formTemplateIds", "replyingToTopic", "editingPost")
showFormTemplateForm(formTemplateIds, replyingToTopic) { showFormTemplateForm(formTemplateIds, replyingToTopic, editingPost) {
if (formTemplateIds?.length > 0 && !replyingToTopic) { // TODO(@keegan): Remove !editingPost once we add edit/draft support for form templates
if (formTemplateIds?.length > 0 && !replyingToTopic && !editingPost) {
return true; return true;
} }