baculum: Fix displaying multitextbox and multicombobox directive controls

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveMultiComboBox.php b/gui/baculum/protected/Web/Portlets/DirectiveMultiComboBox.php
index dc5736c0cc39fa8254215dc5ce83a6c515a0098c..596d88edbfb2b79e851501f441c3608664a7b9bd 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveMultiComboBox.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveMultiComboBox.php
@@ -60,7 +60,11 @@ class DirectiveMultiComboBox extends DirectiveListTemplate {
                $items = array();
 
                if (!is_array($data)) {
-                       $data = array($data);
+                       if ($this->getShow()) {
+                               $data = [$data];
+                       } else {
+                               $data = [];
+                       }
                }
                if (is_array($resource_names)) {
                        if (key_exists($directive_name, $resource_names)) {

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveMultiTextBox.php b/gui/baculum/protected/Web/Portlets/DirectiveMultiTextBox.php
index 7ce3bfe13f366251513db2b07295c15a354f4004..5994072b632b5abad1b2d381402a020869aa2418 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveMultiTextBox.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveMultiTextBox.php
@@ -58,8 +58,12 @@ class DirectiveMultiTextBox extends DirectiveListTemplate {
                $directive_name = $this->getDirectiveName();
 
                $data = $this->getData();
-               if (!is_array($data) ) {
-                       $data = array($data);
+               if (!is_array($data)) {
+                       if ($this->getShow()) {
+                               $data = [$data];
+                       } else {
+                               $data = [];
+                       }
                }
                $values = array();
                for ($i = 0; $i < count($data); $i++) {