Skip to content

Fix(fields): fix undefined option #982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 25, 2025
Merged

Fix(fields): fix undefined option #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
628d0fd
Fix(fields): fix undefined option
stonebuzz Jul 18, 2025
434774b
adapt CHANGELOG
stonebuzz Jul 18, 2025
29609b2
add default
Rom1-B Aug 5, 2025
ce518df
fix
Rom1-B Aug 13, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed
- Fix condition check logic for dropdown field values
- Fix validation for mandatory multiple dropdown
- Fix `twig` error about undefined `dropdown_options`

## [1.21.21] - 2025-03-21

Expand Down
9 changes: 6 additions & 3 deletions templates/fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,13 @@
{% set dropdown_itemtype = call("PluginFieldsDropdown::getClassname", [name]) %}
{% endif %}
{% set name_fk = call("getForeignKeyFieldForItemType", [dropdown_itemtype]) %}
{{ macros.dropdownField(dropdown_itemtype, name_fk, value, label, field_options|merge(dropdown_options)) }}
{{ macros.dropdownField(dropdown_itemtype, name_fk, value, label, field_options|merge(dropdown_options|default({}))) }}

{% elseif type matches '/^dropdown-.+/i' %}
{% set dropdown_options = {'condition': field['dropdown_condition'], 'entity': item.getEntityID()} %}
{% set dropdown_options = {'entity': item.getEntityID()} %}
{% if field['dropdown_condition'] is defined and field['dropdown_condition']|length %}
{% set dropdown_options = dropdown_options|merge({'condition': field['dropdown_condition']}) %}
{% endif %}
{% if field['dropdown_class'] == 'User' %}
{% set dropdown_options = dropdown_options|merge({'entity': -1, 'right': 'all'}) %}
{% elseif field['dropdown_class'] == 'Entity' or item.isRecursive() %}
Expand All @@ -124,7 +127,7 @@
{% 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)) }}
{{ macros.dropdownField(field['dropdown_class'], name, value, label, field_options|merge(dropdown_options|default({}))) }}

{% elseif type == 'glpi_item' %}
{% if not massiveaction %}
Expand Down