From: Matthias Schmidt <gravatronics@live.com>
Date: Wed, 18 Jul 2018 17:04:53 +0000 (+0200)
Subject: Fix issues with ItemListFormField
X-Git-Tag: 5.2.0_Alpha_1~680^2~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=17dd76cca5e5a582772d07c2996fff0512fa0d14;p=GitHub%2FWoltLab%2FWCF.git

Fix issues with ItemListFormField

See #2509
---

diff --git a/wcfsetup/install/files/acp/templates/__itemListFormField.tpl b/wcfsetup/install/files/acp/templates/__itemListFormField.tpl
index 8dd2725e2c..531e754d40 100644
--- a/wcfsetup/install/files/acp/templates/__itemListFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__itemListFormField.tpl
@@ -1,6 +1,6 @@
 {include file='__formFieldHeader'}
 
-<input type="text" id="{@$field->getPrefixedId()}" name="{@$field->getPrefixedId()}" value="{$field->getValue()}" class="long"{if $field->isAutofocused()} autofocus{/if}{if $field->isRequired()} required{/if}{if $field->isImmutable()} disabled{/if}>
+<input type="text" id="{@$field->getPrefixedId()}" name="{@$field->getPrefixedId()}" value="{$field->getValue()}" class="long"{if $field->isAutofocused()} autofocus{/if}{if $field->isImmutable()} disabled{/if}>
 
 <script data-relocate="true">
 	require(['WoltLabSuite/Core/Ui/ItemList/Static'], function(UiItemListStatic) {
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/ItemListFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/ItemListFormField.class.php
index 4801ea2c31..6f553b582b 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/ItemListFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/ItemListFormField.class.php
@@ -197,6 +197,10 @@ class ItemListFormField extends AbstractFormField {
 			$invalidItems = [];
 			foreach ($this->getValue() as $item) {
 				switch ($this->getSaveValueType()) {
+					case self::SAVE_VALUE_TYPE_ARRAY:
+						// nothing
+						break;
+					
 					case self::SAVE_VALUE_TYPE_CSV:
 						if (strpos($item, ',') !== false) {
 							$invalidItems[] = $item;
@@ -227,6 +231,9 @@ class ItemListFormField extends AbstractFormField {
 				));
 			}
 		}
+		else if ($this->isRequired()) {
+			$this->addValidationError(new FormFieldValidationError('empty'));
+		}
 		
 		parent::validate();
 	}