Merge branch 'main' into fix/entity-restrict-criteria-without-session

Author: RomainLvr

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 - Fix SQL warning when no user session is active during plugin init
+- Fix text area fields alignment
 - Fix error when submitting a form with an hidden question of type `Field`
 - Fixed a bug where a field was deleted when at least one question in a form was linked to another field
 

hook.php

@@ -377,7 +377,7 @@ function plugin_fields_addWhere($link, $nott, $itemtype, $ID, $val, $searchtype)
                 $link .= ' NOT ';
             }
 
-            return $link . 'CAST(' . $DB->quoteName($table . '_' . $field) . '.' . $DB->quoteName($field) . ' AS DECIMAL(10,7))' . $operator . ' ' . $DB->quoteValue($val) ;
+            return $link . ' CAST(' . $DB->quoteName($table . '_' . $field) . '.' . $DB->quoteName($field) . ' AS DECIMAL(10,7))' . $operator . ' ' . $DB->quoteValue($val);
         } else {
             // if 'number' field with name is found with <= or >= or < or > search
             // update WHERE clause with the correct operator

templates/fields.html.twig

@@ -28,16 +28,46 @@
 
 {% import 'components/form/fields_macros.html.twig' as macros %}
 
-{% set already_wrapped = item is instanceof('CommonITILObject') and container.fields['type'] == 'dom' %}
-{% set dropdown_item = item is instanceof('CommonDropdown') and container.fields['type'] == 'dom' %}
-
-{% if item is instanceof('Glpi\\Form\\Form') %}
-    {% set already_wrapped = true %}
+{% set in_itilobject   = item is instanceof('CommonITILObject') and container.fields['type'] == 'dom' %}
+{% set in_form_builder = item is instanceof('Glpi\\Form\\Form') %}
+{% set already_wrapped = in_itilobject or in_form_builder %}
+{% set dropdown_item   = item is instanceof('CommonDropdown') and container.fields['type'] == 'dom' %}
+
+{% set textarea_display_options = {
+    'in_itilobject': {
+        'field_class': 'col-12',
+        'label_class': 'col-2',
+        'input_class': 'col-10',
+        'is_horizontal': true,
+        'align_label_right': true,
+    },
+    'in_form_builder': {
+        'field_class': 'col-12',
+        'label_class': 'form-label',
+        'input_class': 'w-100',
+        'is_horizontal': false,
+        'align_label_right': false,
+    },
+    'default': {
+        'field_class': 'col-12',
+        'label_class': 'col-xxl-2',
+        'input_class': 'col-xxl-10',
+        'is_horizontal': true,
+        'align_label_right': true,
+    },
+} %}
+
+{% if in_itilobject %}
+    {% set current_textarea_options = textarea_display_options.in_itilobject %}
+{% elseif in_form_builder %}
+    {% set current_textarea_options = textarea_display_options.in_form_builder %}
+{% else %}
+    {% set current_textarea_options = textarea_display_options.default %}
 {% endif %}
 
 {% if not already_wrapped and not dropdown_item%}
 
-{% set class = item.isNewItem() or item is instanceof('User') ? 'col-xxl-12' : 'col-xxl-9' %}
+{% set class = item.isNewItem() or item is instanceof('User') or container.fields['type'] == 'dom' ? 'col-xxl-12' : 'col-xxl-9' %}
     <div class="col-12  {{ class }} flex-column">
         <div class="d-flex flex-row flex-wrap flex-xl-nowrap">
             <div class="row flex-row align-items-start flex-grow-1">
@@ -88,15 +118,11 @@
             })) }}
 
     {% elseif type == 'textarea' %}
-        {{ macros.textareaField(input_name, value, label, field_options) }}
+        {{ macros.textareaField(input_name, value, label, field_options|merge(current_textarea_options)) }}
 
     {% elseif type == 'richtext' %}
-        {{ macros.textareaField(input_name, value, label, field_options|merge({
+        {{ macros.textareaField(input_name, value, label, field_options|merge(current_textarea_options)|merge({
             'enable_richtext': true,
-            'field_class': 'col-12',
-            'label_class': '',
-            'input_class': '',
-            'align_label_right': false,
         })) }}
 
     {% elseif type == 'yesno' %}

templates/question_type_administration.html.twig

@@ -77,7 +77,7 @@
 
 {% if not is_ajax_reload %}
     <script>
-        import(GLPI_PLUGINS_PATH.fields + "/js/modules/QuestionField.js").then((m) => {
+        import(CFG_GLPI.root_doc + GLPI_PLUGINS_PATH.fields + "/js/modules/QuestionField.js").then((m) => {
             const questionField = new m.GlpiPluginFieldsQuestionTypeField();
 
             {% if question is not null %}
@@ -94,7 +94,7 @@
     </script>
 {% else %}
     <script>
-        import(GLPI_PLUGINS_PATH.fields + "/js/modules/QuestionField.js").then((m) => {
+        import(CFG_GLPI.root_doc + GLPI_PLUGINS_PATH.fields + "/js/modules/QuestionField.js").then((m) => {
             const questionField = new m.GlpiPluginFieldsQuestionTypeField();
             questionField.lockMandatoryInput(
                 $('[data-glpi-form-editor-question-type-fields-field-id-selector="{{ rand }}"]').closest('[data-glpi-form-editor-question-details]'),