fix(question): uniformuze question and section JS code

to be continued when question design will be converted into twig
pluginsGLPI · Jan 31, 2022 · 4e997e5 · 4e997e5
1 parent 2d961c7
commit 4e997e5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ajax/question_add.php b/ajax/question_add.php
@@ -41,7 +41,8 @@
 }
 
 if (!$question->add($_REQUEST)) {
-    http_response_code(400);
+    http_response_code(500);
+    Session::addMessageAfterRedirect(__('Could not add the question', 'formcreator'), false, ERROR);
     exit;
 }
 $json = [

diff --git a/inc/question.class.php b/inc/question.class.php
@@ -912,7 +912,9 @@ public function showForm($ID, $options = []) {
 
       echo '<tr>';
       echo '<td colspan="4" class="center">';
-      echo Html::hidden('id', ['value' => $ID]);
+      if ($ID > 0) {
+         echo Html::hidden('id', ['value' => $ID]);
+      }
       echo Html::hidden('uuid', ['value' => $this->fields['uuid']]);
       echo '</td>';
       echo '</tr>';

diff --git a/js/scripts.js b/js/scripts.js
@@ -708,7 +708,6 @@ var plugin_formcreator = new function() {
          );
          that.resetTabs();
       });
-      glpi_close_all_dialogs();
    }
 
    this.editQuestion = function () {
@@ -724,7 +723,6 @@ var plugin_formcreator = new function() {
       }).done(function(data) {
          var question = $('.plugin_formcreator_form_design[data-itemtype="PluginFormcreatorForm"] [data-itemtype="PluginFormcreatorQuestion"][data-id="' + questionId + '"]');
          question.find('[data-field="name"]').text(data['name'])
-         glpi_close_all_dialogs();
          that.resetTabs();
       });
 
@@ -1683,7 +1681,7 @@ function pluginFormcreatorInitializeUrgency(fieldName, rand) {
 }
 
 function plugin_formcreator_changeQuestionType(rand) {
-   var questionId = $('form[name="asset_form"][data-itemtype="PluginFormcreatorQuestion"] [name="id"]').val();
+   var questionId = $('form[name="asset_form"][data-itemtype="PluginFormcreatorQuestion"] [name="id"]').val() || 0;
    var questionType = $('form[name="asset_form"][data-itemtype="PluginFormcreatorQuestion"] [name="fieldtype"]').val();
 
    $.post({