feat(core): manage fields plugin

Author: stonebuzz

ajax/dropdown_fields_values.php

@@ -0,0 +1,58 @@
+<?php
+/**
+ * ---------------------------------------------------------------------
+ * Formcreator is a plugin which allows creation of custom forms of
+ * easy access.
+ * ---------------------------------------------------------------------
+ * LICENSE
+ *
+ * This file is part of Formcreator.
+ *
+ * Formcreator is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Formcreator is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Formcreator. If not, see <http://www.gnu.org/licenses/>.
+ * ---------------------------------------------------------------------
+ * @copyright Copyright © 2011 - 2021 Teclib'
+ * @license   http://www.gnu.org/licenses/gpl.txt GPLv3+
+ * @link      https://github.com/pluginsGLPI/formcreator/
+ * @link      https://pluginsglpi.github.io/formcreator/
+ * @link      http://plugins.glpi-project.org/#/plugin/formcreator
+ * ---------------------------------------------------------------------
+ */
+
+use GlpiPlugin\Formcreator\Field\FieldsField;
+
+include ('../../../inc/includes.php');
+
+Session::checkRight('entity', UPDATE);
+
+if (isset($_REQUEST['block_id'])
+    && $_REQUEST['block_id'] != '0') {
+   $block_id = $_REQUEST['block_id'];
+   $fields = FieldsField::getFieldsFromBlock($block_id);
+
+   //get value in case of update
+   $selectedValue = 0;
+   if (isset($_REQUEST['question_id'])){
+      $question = new PluginFormcreatorQuestion();
+      $question->getFromDB((int) $_REQUEST['question_id']);
+      $decodedValues = json_decode($question->fields['values'], JSON_OBJECT_AS_ARRAY);
+      $selectedValue = $decodedValues['dropdown_fields_field'] ?? '0';
+   }
+
+   Dropdown::showFromArray('dropdown_fields_field',
+      $fields, [
+         'display_emptychoice'   => false,
+         'value' => $selectedValue,
+      ]
+   );
+}

inc/abstractfield.class.php

@@ -87,14 +87,6 @@ public function getRawValue() {
    public function show(string $domain, bool $canEdit = true): string {
       $html = '';
 
-      if ($this->isVisibleField()) {
-         $html .= '<label for="formcreator_field_' . $this->question->getID() . '">';
-         $html .= __($this->getLabel(), $domain);
-         if ($canEdit && $this->question->fields['required']) {
-            $html .= ' <span class="red">*</span>';
-         }
-         $html .= '</label>';
-      }
       if ($this->isEditableField() && !empty($this->question->fields['description'])) {
          $description = $this->question->fields['description'];
          foreach (PluginFormcreatorCommon::getDocumentsFromTag($description) as $document) {
@@ -110,7 +102,22 @@ public function show(string $domain, bool $canEdit = true): string {
       $html .= $this->getRenderedHtml($domain, $canEdit);
       $html .= '</div>';
 
-      return $html;
+
+      //Determine if fields is mandatory after generate it's HTML
+      //usefull for fields plugin
+      //because fields plugin manage it's own mandatory system and can overload $this->question->fields['required']
+      //when HTML is generated (see $this->getRenderedHtml)
+      $label = '';
+      if ($this->isVisibleField()) {
+         $label .= '<label for="formcreator_field_' . $this->question->getID() . '">';
+         $label .= __($this->getLabel(), $domain);
+         if ($canEdit && $this->question->fields['required']) {
+            $label .= ' <span class="red">*</span>';
+         }
+         $label .= '</label>';
+      }
+
+      return $label.$html;
    }
 
    public function getRenderedHtml($domain, $canEdit = true): string {