diff --git a/CHANGELOG.md b/CHANGELOG.md index bb7b07b2..2af809d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Fix incompatibility of `multiple` dropdowns with `massiveaction` - Fix default value properly applied in multiple dropdown search options - Fix `search option` for default values in `multiple` dropdown +- Fix shared dropdowns not displaying in `massiveaction` ## [1.21.22] - 2025-05-28 diff --git a/templates/fields.html.twig b/templates/fields.html.twig index b1a770f7..21102ac2 100644 --- a/templates/fields.html.twig +++ b/templates/fields.html.twig @@ -115,18 +115,16 @@ {{ macros.dropdownField(dropdown_itemtype, name_fk, value, label, field_options|merge(dropdown_options)) }} {% elseif type matches '/^dropdown-.+/i' %} - {% if not massiveaction %} - {% set dropdown_options = {'condition': field['dropdown_condition'], 'entity': item.getEntityID()} %} - {% if field['dropdown_class'] == 'User' %} - {% set dropdown_options = dropdown_options|merge({'entity': -1, 'right': 'all'}) %} - {% elseif field['dropdown_class'] == 'Entity' or item.isRecursive() %} - {% set dropdown_options = dropdown_options|merge({'entity_sons': true}) %} - {% endif %} - {% if field['multiple'] %} - {% set dropdown_options = dropdown_options|merge({'multiple': true}) %} - {% endif %} - {{ macros.dropdownField(field['dropdown_class'], name, value, label, field_options|merge(dropdown_options)) }} + {% set dropdown_options = {'condition': field['dropdown_condition'], 'entity': item.getEntityID()} %} + {% if field['dropdown_class'] == 'User' %} + {% set dropdown_options = dropdown_options|merge({'entity': -1, 'right': 'all'}) %} + {% elseif field['dropdown_class'] == 'Entity' or item.isRecursive() %} + {% set dropdown_options = dropdown_options|merge({'entity_sons': true}) %} + {% endif %} + {% if field['multiple'] %} + {% set dropdown_options = dropdown_options|merge({'multiple': true}) %} {% endif %} + {{ macros.dropdownField(field['dropdown_class'], name, value, label, field_options|merge(dropdown_options)) }} {% elseif type == 'glpi_item' %} {% if not massiveaction %}