Fix Twig templates

trasher · web-flow · commit fd80f577d891 · 2025-05-05T16:07:08.000+02:00
* Twig fixes
* Fix constants notation
* Fix call on null
diff --git a/src/Glpi/Form/Condition/ConditionData.php b/src/Glpi/Form/Condition/ConditionData.php
@@ -79,7 +79,7 @@ public function getLogicOperator(): LogicOperator
 
     public function getValueOperator(): ?ValueOperator
     {
-        // No follback here as an empty value is valid if the condition is not
+        // No fallback here as an empty value is valid if the condition is not
         // fully specified yet.
         return ValueOperator::tryFrom($this->value_operator ?? "");
     }
diff --git a/templates/components/checkbox_matrix.html.twig b/templates/components/checkbox_matrix.html.twig
@@ -78,7 +78,7 @@
                   </td>
 
                   {% for col_name, column in columns %}
-                     {% set content = row['columns'][col_name] %}
+                     {% set content = row['columns'][col_name] ?? false %}
                      <td>
                         {% if content is iterable and content['checked'] is defined %}
                            {% if content['readonly'] is not defined %}
diff --git a/templates/components/illustration/icon.svg.twig b/templates/components/illustration/icon.svg.twig
@@ -31,7 +31,7 @@
  #}
 
 <svg role="img" width="{{ width }}" height="{{ height }}">
-    {% if title is not empty %}
+    {% if (title ?? '') is not empty %}
         <title>{{ title }}</title>
     {% endif %}
     <use xlink:href="{{ path(file_path) }}#{{ icon_id }}"/>
diff --git a/templates/components/itilobject/actors/field.html.twig b/templates/components/itilobject/actors/field.html.twig
@@ -56,7 +56,7 @@
       {% set unique_id = "user_opt_" ~ actortype ~ actor.itemtype ~ actor.items_id %}
       <option selected="true" value="{{ actor['itemtype'] ~ '_' ~ actor['items_id'] }}"
             data-itemtype="{{ actor['itemtype'] }}" data-items-id="{{ actor['items_id'] }}"
-            data-use-notification="{{ actor['use_notification'] }}"
+            data-use-notification="{{ actor['use_notification'] ?? false }}"
             data-default-email="{{ actor['default_email'] ?? '' }}"
             data-alternative-email="{{ actor['alternative_email'] ?? '' }}"
             {% if (actor['itemtype'] == 'User' and itiltemplate.isHiddenField('_users_id_' ~ actortype)) or (actor['itemtype'] == 'Group' and itiltemplate.isHiddenField('_groups_id_' ~ actortype)) %}
diff --git a/templates/components/itilobject/actors/main.html.twig b/templates/components/itilobject/actors/main.html.twig
@@ -228,7 +228,7 @@
             {
                itemtype: "{{ actor['itemtype'] }}",
                items_id: "{{ actor['items_id'] }}",
-               use_notification: {{ actor['use_notification'] ? "1" : "0" }},
+               use_notification: {{ (actor['use_notification'] ?? false) ? "1" : "0" }},
                alternative_email: "{{ actor['alternative_email'] ?? '' }}",
                default_email: "{{ actor['default_email'] ?? '' }}",
             },
diff --git a/templates/layout/parts/head.html.twig b/templates/layout/parts/head.html.twig
@@ -31,7 +31,7 @@
  #}
 
 <!DOCTYPE html>
-<html lang="{{ lang }}"
+<html lang="{{ lang ?? 'en' }}"
     {% if session('glpihighcontrast_css') %}
         data-high-contrast="1"
     {% endif %}
@@ -44,7 +44,7 @@
     {% endif %}
 >
 <head>
-   <title>{{ title }} - {{ config('app_name') }}</title>
+   <title>{% if title is defined %}{{ title }} - {% endif %}{{ config('app_name') }}</title>
 
    <meta charset="utf-8" />
 
diff --git a/templates/pages/admin/customobjects/profiles.html.twig b/templates/pages/admin/customobjects/profiles.html.twig
@@ -35,6 +35,8 @@
 {% set params = params|merge({'candel': false}) %}
 {# do not display footer with dates #}
 {% set params = params|merge({'formfooter': false}) %}
+{% set target = target|default('') %} {# not sure empty target should happen. #}
+{% set formoptions = formoptions|default('') %}
 
 <div class="p-2">
     <form id="main-form" name="asset_form" method="post" action="{{ target }}" {{ formoptions|raw }} enctype="multipart/form-data" data-submit-once>
@@ -44,6 +46,7 @@
                 'rand': random(),
                 'col_check_all': 'top',
                 'row_check_all': true,
+                'first_cell': '',
             },
             'columns': matrix_columns,
             'rows': matrix_rows,
diff --git a/templates/pages/admin/form/condition_handler_templates/input.html.twig b/templates/pages/admin/form/condition_handler_templates/input.html.twig
@@ -37,7 +37,7 @@
     placeholder="{{ __("Enter a value...") }}"
     data-glpi-conditions-editor-value
     aria-label="{{ input_label }}"
-    {% for attribute, value in attributes %}
+    {% for attribute, value in (attributes ?? []) %}
         {{ attribute }}="{{ value }}"
     {% endfor %}
 />
diff --git a/templates/pages/admin/form/conditional_visibility_editor.html.twig b/templates/pages/admin/form/conditional_visibility_editor.html.twig
@@ -89,13 +89,17 @@
                     />
 
                     <span class="me-2 value-operator-selector">
+                        {% set value_op = '' %}
+                        {% if condition.getValueOperator() is not null %}
+                            {% set value_op = condition.getValueOperator().value %}
+                        {% endif %}
                         {% do call('Dropdown::showFromArray', [
                             '_conditions[' ~ loop.index0 ~ '][value_operator]',
                             manager.getValueOperatorDropdownValues(
                                 condition.getItemUuid()
                             ),
                             {
-                                'value': condition.getValueOperator().value,
+                                'value': value_op,
                                 'aria_label' : __('Value operator'),
                                 'add_data_attributes': {
                                     'glpi-conditions-editor-value-operator': '',
diff --git a/templates/pages/admin/helpdesk_home_config_tiles.html.twig b/templates/pages/admin/helpdesk_home_config_tiles.html.twig
@@ -30,6 +30,7 @@
  # ---------------------------------------------------------------------
  #}
 
+{% set editable = editable|default(false) %}
 {% for tile in tiles %}
     <section
         class="col-12 col-lg-6 col-xl-4 d-flex-soft"
diff --git a/templates/pages/form_renderer.html.twig b/templates/pages/form_renderer.html.twig
@@ -56,11 +56,11 @@
                 data-glpi-form-renderer-form-header
             >
                 <h1 class="form-title mb-2" aria-label="{{ __('Form title') }}">
-                    {{ translate_item_key(form, constant(get_class(form) ~ '::TRANSLATION_KEY_NAME')) }}
+                    {{ translate_item_key(form, constant('TRANSLATION_KEY_NAME', form)) }}
                 </h1>
 
                 <div class="text-muted form-description" aria-label="{{ __('Form description') }}" role="note">
-                    {{ translate_item_key(form, constant(get_class(form) ~ '::TRANSLATION_KEY_HEADER'))|safe_html }}
+                    {{ translate_item_key(form, constant('TRANSLATION_KEY_HEADER', form))|safe_html }}
                 </div>
             </div>
 
@@ -100,11 +100,11 @@
                         <div class="card-body">
                             {% if not is_single_section_form %}
                                 <h2 class="mb-1 {{ not section.fields.name ? "text-muted" : "" }}">
-                                {{ translate_item_key(section, constant(get_class(section) ~ '::TRANSLATION_KEY_NAME'))|default(__('Untitled section')) }}
+                                {{ translate_item_key(section, constant('TRANSLATION_KEY_NAME', section))|default(__('Untitled section')) }}
                             </h2>
 
                                 <div class="text-muted section-description mb-3">
-                                    {{ translate_item_key(section, constant(get_class(section) ~ '::TRANSLATION_KEY_DESCRIPTION'))|safe_html }}
+                                    {{ translate_item_key(section, constant('TRANSLATION_KEY_DESCRIPTION', section))|safe_html }}
                                 </div>
                             {% endif %}
 
@@ -167,8 +167,8 @@
                                                 {% endif %}
                                             >
                                                 <h3 class="mb-2 {{ not form_block.fields.name ? "text-muted" : "" }}">
-                                                    {{ translate_item_key(form_block, constant(get_class(form_block) ~ '::TRANSLATION_KEY_NAME'))|default(__('Untitled question')) }}
-                                                    {% if form_block.fields.is_mandatory %}
+                                                    {{ translate_item_key(form_block, constant('TRANSLATION_KEY_NAME', form_block))|default(__('Untitled question')) }}
+                                                    {% if form_block.fields.is_mandatory ?? false %}
                                                         <span class="text-danger">*</span>
                                                     {% endif %}
                                                 </h3>
@@ -180,7 +180,7 @@
                                                 {% endif %}
 
                                                 <div class="text-muted block-description">
-                                                    {{ translate_item_key(form_block, constant(get_class(form_block) ~ '::TRANSLATION_KEY_DESCRIPTION'))|safe_html }}
+                                                    {{ translate_item_key(form_block, constant('TRANSLATION_KEY_DESCRIPTION', form_block))|safe_html }}
                                                 </div>
                                             </section>
                                         {% endif %}

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ public function getLogicOperator(): LogicOperator`
`79`	`79`
`80`	`80`	`public function getValueOperator(): ?ValueOperator`
`81`	`81`	`{`
`82`		`- // No follback here as an empty value is valid if the condition is not`
	`82`	`+ // No fallback here as an empty value is valid if the condition is not`
`83`	`83`	`// fully specified yet.`
`84`	`84`	`return ValueOperator::tryFrom($this->value_operator ?? "");`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@`
`228`	`228`	`{`
`229`	`229`	`itemtype: "{{ actor['itemtype'] }}",`
`230`	`230`	`items_id: "{{ actor['items_id'] }}",`
`231`		`- use_notification: {{ actor['use_notification'] ? "1" : "0" }},`
	`231`	`+ use_notification: {{ (actor['use_notification'] ?? false) ? "1" : "0" }},`
`232`	`232`	`alternative_email: "{{ actor['alternative_email'] ?? '' }}",`
`233`	`233`	`default_email: "{{ actor['default_email'] ?? '' }}",`
`234`	`234`	`},`