Always use `scrollableCheckboxList` for `MultipleSelectionFormField`

Close #3940

diff --git a/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl b/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
index c55c7dc20233a3b2fac90f3e188360fb5c1eda8c..ffc3adb229ed5e474d250ea1607f2e42e19cd364 100644 (file)
--- a/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
+++ b/com.woltlab.wcf/templates/__multipleSelectionFormField.tpl
@@ -1,6 +1,6 @@
 {if $field->isFilterable()}
        <script data-relocate="true">
-               require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
+               require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], (Language, UiItemListFilter) => {
                        Language.addObject({
                                'wcf.global.filter.button.visibility': '{jslang}wcf.global.filter.button.visibility{/jslang}',
                                'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
@@ -14,33 +14,23 @@
                        new UiItemListFilter('{@$field->getPrefixedId()}_list');
                });
        </script>
-       
-       <ul class="scrollableCheckboxList" id="{@$field->getPrefixedId()}_list">
-               {foreach from=$field->getNestedOptions() item=__fieldNestedOption}
-                       <li{if $__fieldNestedOption[depth] > 0} style="padding-left: {$__fieldNestedOption[depth]*20}px"{/if}>
-                               <label><input {*
-                                               *}type="checkbox" {*
-                                               *}name="{@$field->getPrefixedId()}[]" {*
-                                               *}value="{$__fieldNestedOption[value]}"{*
-                                               *}{if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
-                                               *}{if $field->getValue() !== null && $__fieldNestedOption[value]|in_array:$field->getValue() && $__fieldNestedOption[isSelectable]} checked{/if}{*
-                                               *}{if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if}{*
-                                               *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
-                                       *}> {@$__fieldNestedOption[label]}</label>
-                       </li>
-               {/foreach}
-       </ul>
-{else}
+{/if}
+
+<ul class="scrollableCheckboxList" id="{@$field->getPrefixedId()}_list">
        {foreach from=$field->getNestedOptions() item=__fieldNestedOption}
-               <label{if $__fieldNestedOption[depth] > 0} style="margin-left: {$__fieldNestedOption[depth]*20}px"{/if}>
-                       <input type="checkbox" {*
-                               *}name="{@$field->getPrefixedId()}[]" {*
-                               *}value="{$__fieldNestedOption[value]}"{*
-                               *}{if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
-                               *}{if $field->getValue() !== null && $__fieldNestedOption[value]|in_array:$field->getValue() && $__fieldNestedOption[isSelectable]} checked{/if}{*
-                               *}{if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if}{*
-                               *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
-                       *}> {@$__fieldNestedOption[label]}
-               </label>
+               <li{if $__fieldNestedOption[depth] > 0} style="padding-left: {$__fieldNestedOption[depth]*20}px"{/if}>
+                       <label>
+                               <input {*
+                                       *}type="checkbox" {*
+                                       *}name="{@$field->getPrefixedId()}[]" {*
+                                       *}value="{$__fieldNestedOption[value]}"{*
+                                       *}{if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+                                       *}{if $field->getValue() !== null && $__fieldNestedOption[value]|in_array:$field->getValue() && $__fieldNestedOption[isSelectable]} checked{/if}{*
+                                       *}{if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if}{*
+                                       *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+                               *}>
+                               {@$__fieldNestedOption[label]}
+                       </label>
+               </li>
        {/foreach}
-{/if}
+</ul>

diff --git a/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl b/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
index c55c7dc20233a3b2fac90f3e188360fb5c1eda8c..ffc3adb229ed5e474d250ea1607f2e42e19cd364 100644 (file)
--- a/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
+++ b/wcfsetup/install/files/acp/templates/__multipleSelectionFormField.tpl
@@ -1,6 +1,6 @@
 {if $field->isFilterable()}
        <script data-relocate="true">
-               require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], function(Language, UiItemListFilter) {
+               require(['Language', 'WoltLabSuite/Core/Ui/ItemList/Filter'], (Language, UiItemListFilter) => {
                        Language.addObject({
                                'wcf.global.filter.button.visibility': '{jslang}wcf.global.filter.button.visibility{/jslang}',
                                'wcf.global.filter.button.clear': '{jslang}wcf.global.filter.button.clear{/jslang}',
@@ -14,33 +14,23 @@
                        new UiItemListFilter('{@$field->getPrefixedId()}_list');
                });
        </script>
-       
-       <ul class="scrollableCheckboxList" id="{@$field->getPrefixedId()}_list">
-               {foreach from=$field->getNestedOptions() item=__fieldNestedOption}
-                       <li{if $__fieldNestedOption[depth] > 0} style="padding-left: {$__fieldNestedOption[depth]*20}px"{/if}>
-                               <label><input {*
-                                               *}type="checkbox" {*
-                                               *}name="{@$field->getPrefixedId()}[]" {*
-                                               *}value="{$__fieldNestedOption[value]}"{*
-                                               *}{if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
-                                               *}{if $field->getValue() !== null && $__fieldNestedOption[value]|in_array:$field->getValue() && $__fieldNestedOption[isSelectable]} checked{/if}{*
-                                               *}{if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if}{*
-                                               *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
-                                       *}> {@$__fieldNestedOption[label]}</label>
-                       </li>
-               {/foreach}
-       </ul>
-{else}
+{/if}
+
+<ul class="scrollableCheckboxList" id="{@$field->getPrefixedId()}_list">
        {foreach from=$field->getNestedOptions() item=__fieldNestedOption}
-               <label{if $__fieldNestedOption[depth] > 0} style="margin-left: {$__fieldNestedOption[depth]*20}px"{/if}>
-                       <input type="checkbox" {*
-                               *}name="{@$field->getPrefixedId()}[]" {*
-                               *}value="{$__fieldNestedOption[value]}"{*
-                               *}{if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
-                               *}{if $field->getValue() !== null && $__fieldNestedOption[value]|in_array:$field->getValue() && $__fieldNestedOption[isSelectable]} checked{/if}{*
-                               *}{if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if}{*
-                               *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
-                       *}> {@$__fieldNestedOption[label]}
-               </label>
+               <li{if $__fieldNestedOption[depth] > 0} style="padding-left: {$__fieldNestedOption[depth]*20}px"{/if}>
+                       <label>
+                               <input {*
+                                       *}type="checkbox" {*
+                                       *}name="{@$field->getPrefixedId()}[]" {*
+                                       *}value="{$__fieldNestedOption[value]}"{*
+                                       *}{if !$field->getFieldClasses()|empty} class="{implode from=$field->getFieldClasses() item='class' glue=' '}{$class}{/implode}"{/if}{*
+                                       *}{if $field->getValue() !== null && $__fieldNestedOption[value]|in_array:$field->getValue() && $__fieldNestedOption[isSelectable]} checked{/if}{*
+                                       *}{if $field->isImmutable() || !$__fieldNestedOption[isSelectable]} disabled{/if}{*
+                                       *}{foreach from=$field->getFieldAttributes() key='attributeName' item='attributeValue'} {$attributeName}="{$attributeValue}"{/foreach}{*
+                               *}>
+                               {@$__fieldNestedOption[label]}
+                       </label>
+               </li>
        {/foreach}
-{/if}
+</ul>