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

Author: btry

inc/abstracttarget.class.php

@@ -221,7 +221,7 @@ protected function prepareTemplate($template, PluginFormcreatorFormAnswer $formA
     * @param PluginFormcreatorFormanswer $formanswer the source formanswer
     * @return array
     */
-   protected function appendFieldsData(array$input, PluginFormcreatorFormanswer $formanswer): array {
+   protected function appendFieldsData(array $input, PluginFormcreatorFormanswer $formanswer): array {
       global $DB;
 
       //get all PluginFormcreatorAnswer

inc/common.class.php

@@ -841,7 +841,7 @@ public static function showMiniDashboard(): void {
 
       if (PluginFormcreatorEntityconfig::getUsedConfig('is_dashboard_visible', Session::getActiveEntity()) == PluginFormcreatorEntityconfig::CONFIG_DASHBOARD_VISIBLE) {
          if (version_compare(GLPI_VERSION, '10.0.3') > 0) {
-            $dashboard = new Glpi\Dashboard\Grid('plugin_formcreator_issue_counters', 33, 1, 'mini_core');
+            $dashboard = new Glpi\Dashboard\Grid('plugin_formcreator_issue_counters', 33, 2, 'mini_core');
          } else {
             $dashboard = new Glpi\Dashboard\Grid('plugin_formcreator_issue_counters', 33, 0, 'mini_core');
          }

inc/field/textfield.class.php

@@ -109,7 +109,7 @@ public function getValueForDesign(): string {
    }
 
    public function getValueForTargetText($domain, $richText): ?string {
-      return Sanitizer::encodeHtmlSpecialChars($this->value);
+      return Sanitizer::encodeHtmlSpecialChars($this->value ?? '');
    }
 
    public function moveUploads() {

inc/issue.class.php

@@ -509,13 +509,25 @@ public function rawSearchOptions() {
       $hide_technician = false;
       $hide_technician_group = false;
       if (!Session::isCron()) {
-         $user = new User();
-         if (empty($user->getAnonymizedName(Session::getActiveEntity()))) {
-            $hide_technician = true;
-         }
-         $group = new Group();
-         if (empty($group->getAnonymizedName(Session::getActiveEntity()))) {
-            $hide_technician_group = true;
+         $anonymisation = Entity::getUsedConfig(
+            'anonymize_support_agents',
+            Session::getActiveEntity()
+         );
+         switch ($anonymisation) {
+            case Entity::ANONYMIZE_USE_GENERIC:
+            case Entity::ANONYMIZE_USE_NICKNAME:
+               $hide_technician       = true;
+               $hide_technician_group = true;
+               break;
+
+            case Entity::ANONYMIZE_USE_GENERIC_USER:
+            case Entity::ANONYMIZE_USE_NICKNAME_USER:
+               $hide_technician       = true;
+               break;
+
+            case Entity::ANONYMIZE_USE_GENERIC_GROUP:
+               $hide_technician_group = true;
+               break;
          }
       }
 

inc/question.class.php

@@ -55,7 +55,7 @@ class PluginFormcreatorQuestion extends CommonDBChild implements
    public $taborientation  = 'horizontal';
 
    /** @var PluginFormcreatorFieldInterface|null $field a field describing the question denpending on its field type  */
-   private ?PluginFormcreatorFieldInterface $field = null;
+   public ?PluginFormcreatorFieldInterface $field = null;
 
    private $skipChecks = false;
 

inc/targetchange.class.php

@@ -689,7 +689,7 @@ public function save(PluginFormcreatorFormAnswer $formanswer): ?CommonDBTM {
 
       $data = $this->prepareUploadedFiles($data, $formanswer);
 
-      $this->appendFieldsData($formanswer, $data);
+      $data = $this->appendFieldsData($data, $formanswer);
 
       // Cleanup actors array
       $data = $this->cleanActors($data);

inc/targetproblem.class.php

@@ -209,7 +209,7 @@ public function save(PluginFormcreatorFormAnswer $formanswer): ?CommonDBTM {
 
       $data = $this->prepareUploadedFiles($data, $formanswer);
 
-      $this->appendFieldsData($formanswer, $data);
+      $data = $this->appendFieldsData($data, $formanswer);
 
       // Cleanup actors array
       $data = $this->cleanActors($data);

install/upgrade_to_2.13.7.php

@@ -29,6 +29,8 @@
  * ---------------------------------------------------------------------
  */
 
+use Glpi\Dashboard\Dashboard;
+use Glpi\Dashboard\Item;
 use Glpi\Toolbox\Sanitizer;
 
 class PluginFormcreatorUpgradeTo2_13_7 {
@@ -45,6 +47,7 @@ public function isResyncIssuesRequired() {
    public function upgrade(Migration $migration) {
       $this->migration = $migration;
       $this->fixEncodingInQuestions();
+      $this->resizeWidgets();
    }
 
    /**
@@ -83,4 +86,38 @@ public function fixEncodingInQuestions() {
          );
       }
    }
+
+   /**
+    * Resize widgets of the `plugin_formcreator_issue_counters` dashboard to match
+    * the mini_tickets core dashboard style
+    *
+    * @return void
+    */
+   public function resizeWidgets() {
+      // Get container
+      $dashboard = new Dashboard();
+      $found = $dashboard->getFromDB("plugin_formcreator_issue_counters");
+
+      if (!$found) {
+         // Unable to fetch dashboard
+         return;
+      };
+
+      $di = new Item();
+      $cards = $di->find(['dashboards_dashboards_id' => $dashboard->fields['id']]);
+      $x = 0;
+
+      foreach ($cards as $card) {
+         $di = new Item();
+         $di->update([
+            'id'     => $card['id'],
+            'width'  => 4,
+            'height' => 2,
+            'x'      => $x,
+            'y'      => 0,
+         ]);
+
+         $x +=4;
+      }
+   }
 }

templates/field/fieldsfield.html.twig

@@ -70,4 +70,20 @@
             input_class: 'col-xxl-8',
       }) }}
    {% endif %}
+
+   {{ fields.nullField({
+      label_class: 'col-xxl-4',
+      input_class: 'col-xxl-8',
+   }) }}
+
+   {{ fields.dropdownYesNo(
+      'required',
+      item.field.getField().fields['mandatory'],
+      __('Required', 'formcreator'), {
+         label_class: 'col-xxl-4',
+         input_class: 'col-xxl-8',
+         disabled: true,
+      }
+   ) }}
+
 {% endblock %}