Merge remote-tracking branch 'origin/support/2.13.0' into support/2.14.0

Author: btry

inc/field/glpiselectfield.class.php

@@ -55,7 +55,7 @@ public function showForm(array $options): void {
 
       $this->question->fields['_tree_root'] = $decodedValues['show_tree_root'] ?? Dropdown::EMPTY_VALUE;
       $this->question->fields['_tree_root_selectable'] = $decodedValues['selectable_tree_root'] ?? '0';
-      $this->question->fields['_tree_max_depth'] = $decodedValues['show_tree_depth'] ?? Dropdown::EMPTY_VALUE;
+      $this->question->fields['_tree_max_depth'] = $decodedValues['show_tree_depth'] ?? '0';
       $this->question->fields['_entity_restrict'] = $decodedValues['entity_restrict'] ?? self::ENTITY_RESTRICT_FORM;
       $this->question->fields['_is_tree'] = '0';
       $this->question->fields['_is_entity_restrict'] = '0';

js/scripts.js

@@ -1151,6 +1151,7 @@ var plugin_formcreator = new function() {
 
    this.newTranslation = function (formLanguageId) {
       glpi_ajax_dialog({
+         dialogclass: 'modal-xl',
          url: '../ajax/form_language.php',
          params: {
             action: 'newTranslation',
@@ -1176,6 +1177,11 @@ var plugin_formcreator = new function() {
       }).fail(function () {
          displayAjaxMessageAfterRedirect();
       }).done(function () {
+         // Remove unclosed TinyMCE toolbar
+         var tinyToolbar = document.querySelector('.tox-tinymce-aux');
+         if (tinyToolbar) {
+            tinyToolbar.parentNode.removeChild(tinyToolbar);
+         }
          that.showTranslationEditor(form);
       });
    };

templates/field/glpiselectfield.html.twig

@@ -105,7 +105,7 @@
 
         {{ fields.numberField(
             'show_tree_depth',
-            item.fields['_show_tree_depth'],
+            item.fields['_tree_max_depth'],
             __('Limit subtree depth', 'formcreator'), {
                 label_class: 'col-xxl-4',
                 input_class: 'col-xxl-8',