fix(targetticket): SQL exception, refactor

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Nov 18, 2021 · 2af9d34 · 2af9d34
1 parent cd7a232
commit 2af9d34
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/inc/question.class.php b/inc/question.class.php
@@ -1216,6 +1216,9 @@ public function getQuestionsFromFormBySection($formId, $crit = []) {
     * @return string|int HTML output or random id
     */
    public static function dropdownForForm($formId, $crit, $name, $value = null, $options = []) {
+      if (isset($crit['used']) && count($crit['used']) == 0) {
+         unset($crit['used']);
+      }
       $question = new self();
       $items = $question->getQuestionsFromFormBySection($formId, $crit);
       $options = $options + [

diff --git a/inc/targetticket.class.php b/inc/targetticket.class.php
@@ -539,12 +539,13 @@ protected function showCompositeTicketSettings($rand) {
 
       // dropdown of questions of type GLPI Object / Ticket
       echo '<span id="plugin_formcreator_link_question" style="display: none">';
-      PluginFormcreatorQuestion::dropdownForForm(
+      echo PluginFormcreatorQuestion::dropdownForForm(
          $this->getForm()->getID(),
          [
             'fieldtype' => ['glpiselect'],
             'itemtype'  => [Ticket::class],
             'used'      => $excludedQuestionIds,
+            'display'   => false,
          ],
          '_link_plugin_formcreator_questions_id',
          null