fix(form): avoid useless HTTP requests and php warning

Signed-off-by: Thierry Bugier <tbugier@teclib.com>

Author: btry

inc/question.class.php

@@ -555,12 +555,19 @@ public function setRequired($isRequired) {
     * @param array $input parameters
     */
    public function updateParameters($input) {
+      // The question instance has a field type
       if (!isset($this->fields['fieldtype'])) {
          return;
       }
+      $fieldType = $this->fields['fieldtype'];
+
+      // The fieldtype may change
+      if (isset($input['fieldtype'])) {
+         $fieldType = $input['fieldtype'];
+      }
 
       $this->field = PluginFormcreatorFields::getFieldInstance(
-         $input['fieldtype'],
+         $fieldType,
          $this
       );
       $this->field->updateParameters($this, $input);

js/scripts.js.php

@@ -445,12 +445,16 @@ function buildTiles(list) {
    this.initialPosition = {};
    this.changingItemId = 0;
    this.questionsColumns = <?php echo PluginFormcreatorSection::COLUMNS; ?>;
+   this.dirty = false;
 
    this.setupGridStack = function (group) {
+      var that = this;
       group
       .on('resizestart', this.startChangeItem)
       .on('dragstart', this.startChangeItem)
-      .on('change', this.changeItems)
+      .on('change', function(event, item) {
+         that.changeItems(event, item)
+      })
       .on('dragstop', function(event, item) {
          setTimeout(function() {
             item.helper.find('a').off('click.prevent');
@@ -462,6 +466,7 @@ function buildTiles(list) {
    };
 
    this.initGridStack = function (sectionId) {
+      var that = this;
       var group = $('#plugin_formcreator_form.plugin_formcreator_form_design [data-itemtype="PluginFormcreatorSection"][data-id="' + sectionId + '"] .grid-stack');
       group.gridstack({
          width:          this.questionsColumns,
@@ -482,6 +487,7 @@ function buildTiles(list) {
          }
       }).success(function(data, httpCode) {
          var grid = group.data('gridstack');
+         that.dirty = true;
          $.each(data, function(index, question) {
             grid.addWidget(
                question.html,
@@ -496,6 +502,7 @@ function buildTiles(list) {
                1
             );
          });
+         that.dirty = false;
       }).complete(this.setupGridStack(group));
    };
 
@@ -519,17 +526,15 @@ function buildTiles(list) {
          }
       });
       this.changingItemId = Number($(event.target).attr('data-id'));
-      this.dirty          =  false;
    };
 
    /**
     * Event handler : change an item (resize or move)
     */
    this.changeItems = function (event, items) {
       if (this.dirty === true) {
-         //return;
+         return;
       }
-      this.dirty = true;
       var that = this;
       var changes = {};
       $.each(items, function(index, item) {