From: Marcin Haba <marcin.haba@bacula.pl>
Date: Wed, 30 Sep 2020 19:49:34 +0000 (+0200)
Subject: baculum: Fix displaying multitextbox and multicombobox directive controls
X-Git-Tag: Release-9.6.7~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7acc5484e5e1a1f7117cb373a87a328ef683c18e;p=thirdparty%2Fbacula.git

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 dc5736c0c..596d88edb 100644
--- 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 7ce3bfe13..5994072b6 100644
--- 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++) {