From f397a81984aaeffaa87bc9229e2e22559ab40b7b Mon Sep 17 00:00:00 2001
From: Slade <slade@sladeprice.com>
Date: Wed, 29 Apr 2020 19:33:21 -0600
Subject: [PATCH] Show the color dropdown when creating a new automatic action

Fixes #4443
---
 app/Helper/FormHelper.php               | 16 ++++++++++++++++
 app/Helper/TaskHelper.php               |  4 +---
 app/Template/action_creation/params.php |  3 +--
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/Helper/FormHelper.php b/app/Helper/FormHelper.php
index 65cb1d34f..ecc067b25 100644
--- a/app/Helper/FormHelper.php
+++ b/app/Helper/FormHelper.php
@@ -71,6 +71,22 @@ class FormHelper extends Base
         return $html;
     }
 
+    /**
+     * Display a color select field
+     *
+     * @access public
+     * @param  string $name Field name
+     * @param  array $values Form values
+     * @return string
+     */
+    public function colorSelect($name, array $values)
+    {
+      $colors = $this->colorModel->getList();
+      $html = $this->label(t('Color'), $name);
+      $html .= $this->select($name, $colors, $values, array(), array('tabindex="4"'), 'color-picker');
+      return $html;
+    }
+
     /**
      * Display a radio field group
      *
diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index 6791c2b5e..17b572a0a 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -108,9 +108,7 @@ class TaskHelper extends Base
 
     public function renderColorField(array $values)
     {
-        $colors = $this->colorModel->getList();
-        $html = $this->helper->form->label(t('Color'), 'color_id');
-        $html .= $this->helper->form->select('color_id', $colors, $values, array(), array('tabindex="4"'), 'color-picker');
+        $html = $this->helper->form->colorSelect('color_id', $values);
         return $html;
     }
 
diff --git a/app/Template/action_creation/params.php b/app/Template/action_creation/params.php
index 9083b949f..c92f09f79 100644
--- a/app/Template/action_creation/params.php
+++ b/app/Template/action_creation/params.php
@@ -25,8 +25,7 @@
             <?= $this->form->label($param_desc, $param_name) ?>
             <?= $this->form->select('params['.$param_name.']', $projects_list, $values) ?>
         <?php elseif ($this->text->contains($param_name, 'color_id')): ?>
-            <?= $this->form->label($param_desc, $param_name) ?>
-            <?= $this->form->select('params['.$param_name.']', $colors_list, $values) ?>
+            <?= $this->form->colorSelect('params['.$param_name.']', $values) ?>
         <?php elseif ($this->text->contains($param_name, 'category_id')): ?>
             <?= $this->form->label($param_desc, $param_name) ?>
             <?= $this->form->select('params['.$param_name.']', $categories_list, $values) ?>