Merge branch 'support/2.13.0' into support/2.14.0

pluginsGLPI · Feb 2, 2024 · a0d5c81 · a0d5c81
2 parents 7016b15 + 08d3871
commit a0d5c81
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/inc/field/hiddenfield.class.php b/inc/field/hiddenfield.class.php
@@ -47,7 +47,7 @@ public function isPrerequisites(): bool {
    public function showForm(array $options): void {
       $template = '@formcreator/field/' . $this->question->fields['fieldtype'] . 'field.html.twig';
 
-      $this->question->fields['default_values'] = Html::entities_deep($this->question->fields['default_values']);
+      // $this->question->fields['default_values'] = Html::entities_deep($this->question->fields['default_values']);
       $this->deserializeValue($this->question->fields['default_values']);
       TemplateRenderer::getInstance()->display($template, [
          'item' => $this->question,

diff --git a/install/install.php b/install/install.php
@@ -830,10 +830,10 @@ protected function createMiniDashboardBigNumbers() {
       ];
 
       // With counters
-      $x = 2;
-      $w = 3; // Width
+      $x = 0;
+      $w = 4; // Width
       $h = 1; // Height
-      $s = 1; // space between widgets
+      $s = 0; // space between widgets
       $y = 0;
       foreach ($cards as $key => $options) {
          $item = new Dashboard_Item();