From 1ac241fb9ad0136e5952b733d241ce181270eacd Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Wed, 15 Apr 2020 11:23:41 +1000
Subject: [PATCH] Revert to post_builder

---
 .../discourse/components/wizard-custom-action.js.es6          | 3 +--
 .../discourse/templates/components/wizard-custom-action.hbs   | 4 ++--
 controllers/custom_wizard/admin/wizard.rb                     | 1 +
 lib/custom_wizard/action.rb                                   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/javascripts/discourse/components/wizard-custom-action.js.es6 b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
index dbb55f8f..8f5a6103 100644
--- a/assets/javascripts/discourse/components/wizard-custom-action.js.es6
+++ b/assets/javascripts/discourse/components/wizard-custom-action.js.es6
@@ -1,5 +1,5 @@
 import { default as discourseComputed, observes, on } from 'discourse-common/utils/decorators';
-import { equal, empty, or, notEmpty } from "@ember/object/computed";
+import { equal, empty, or } from "@ember/object/computed";
 import { generateName, selectKitContent, schema } from '../lib/wizard';
 import Component from "@ember/component";
 
@@ -20,7 +20,6 @@ export default Component.extend({
   basicTopicFields: or('createTopic', 'sendMessage', 'openComposer'),
   publicTopicFields: or('createTopic', 'openComposer'),
   showSkipRedirect: or('createTopic', 'sendMessage'),
-  showPostBuilder: notEmpty('action.post_template'),
   
   @discourseComputed('wizard.steps')
   runAfterContent(steps) {
diff --git a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
index 87a16589..75fed890 100644
--- a/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
+++ b/assets/javascripts/discourse/templates/components/wizard-custom-action.hbs
@@ -61,13 +61,13 @@
         )}}
       
       <div class="setting-gutter">
-        {{input type='checkbox' checked=showPostBuilder}}
+        {{input type='checkbox' checked=action.post_builder}}
         <span>{{i18n 'admin.wizard.action.post_builder.checkbox'}}</span>
       </div>
     </div>
   </div>
 
-  {{#if showPostBuilder}}
+  {{#if action.post_builder}}
     <div class="setting full">
       <div class="setting-label">
         <label>{{i18n 'admin.wizard.action.post_builder.label'}}</label>
diff --git a/controllers/custom_wizard/admin/wizard.rb b/controllers/custom_wizard/admin/wizard.rb
index d773f35c..1802ca15 100644
--- a/controllers/custom_wizard/admin/wizard.rb
+++ b/controllers/custom_wizard/admin/wizard.rb
@@ -115,6 +115,7 @@ class CustomWizard::AdminWizardController < CustomWizard::AdminController
         :skip_redirect,
         :url,
         :post,
+        :post_builder,
         :post_template,
         title: mapped_params,
         category: mapped_params,
diff --git a/lib/custom_wizard/action.rb b/lib/custom_wizard/action.rb
index 2ec6fe14..7c4e1adc 100644
--- a/lib/custom_wizard/action.rb
+++ b/lib/custom_wizard/action.rb
@@ -306,7 +306,7 @@ class CustomWizard::Action
       user: user
     ).perform
 
-    params[:raw] = action['post_template'] ?
+    params[:raw] = action['post_builder'] ?
       mapper.interpolate(action['post_template']) :
       data[action['post']]