Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
20 changes: 9 additions & 11 deletions templates/fields.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down