From 82d98892a35b018854d0dadb51e57e9b44de0571 Mon Sep 17 00:00:00 2001
From: Angus McLeod <angus@mcleod.org.au>
Date: Thu, 3 Oct 2019 12:17:33 +1000
Subject: [PATCH] FIX: allow action tags and topic field tag mapping to work
 together

---
 lib/builder.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/builder.rb b/lib/builder.rb
index 8cb86ba7..1d3a80b2 100644
--- a/lib/builder.rb
+++ b/lib/builder.rb
@@ -366,6 +366,9 @@ class CustomWizard::Builder
 
       params[:category] = action_category_id(action, data)
       
+      tags = action['tags'] || []
+      params[:tags] = tags
+      
       topic_custom_fields = {}
 
       if action['add_fields']
@@ -389,7 +392,7 @@ class CustomWizard::Builder
                 end
               end
             else
-              value = [*value] if key === 'tags'
+              value = [*value] + tags if key === 'tags'
               params[key.to_sym] = value
             end
           end