Merge pull request #55 from IchHabRecht/selectbox-handling

Enhance selectbox handling
Gernott · Mar 16, 2017 · da1e335 · da1e335
2 parents 0ac4780 + 3b645ea
commit da1e335
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Classes/Utility/GeneralUtility.php b/Classes/Utility/GeneralUtility.php
@@ -214,7 +214,7 @@ public function getFirstNoneTabField($fields)
     public function removeBlankOptions($haystack)
     {
         foreach ($haystack as $key => $value) {
-            if (is_array($value)) {
+            if (is_array($value) && $key !== 'items') {
                 $haystack[$key] = $this->removeBlankOptions($haystack[$key]);
             }
             if (empty($haystack[$key])) {

diff --git a/Resources/Public/Scripts/scripts.js b/Resources/Public/Scripts/scripts.js
@@ -164,14 +164,16 @@ jQuery(document).ready(function () {
 
 		// Checkbox items:
 		jQuery('.tx_mask_fieldcontent_items').each(function () {
+            var id = this.id;
 			itemArray = this.value.split('\n');
 			output = "";
 			jQuery.each(itemArray, function (key, line) {
 				lineArray = line.split(',');
 				output += '<input type="hidden" name="tx_mask_tools_maskmask[storage][tca][--index--][config][items][' + key + '][0]" value="' + lineArray[0] + '" />';
-				if (lineArray[1] !== undefined) {
-					output += '<input type="hidden" name="tx_mask_tools_maskmask[storage][tca][--index--][config][items][' + key + '][1]" value="' + lineArray[1].trim() + '" />';
-				}
+				if (id !== 'check_items') {
+					value = (lineArray[1] !== undefined) ? lineArray[1] : key.toString();
+					output += '<input type="hidden" name="tx_mask_tools_maskmask[storage][tca][--index--][config][items][' + key + '][1]" value="' + value.trim() + '" />';
+                }
 			});
 			jQuery(this).parent().find(".tx_mask_fieldcontent_itemsresult").html(output);
 		});