From e7d47e840e3ca22204227c12301371f5ad830bdb Mon Sep 17 00:00:00 2001
From: Jayati Shrivastava <gaurijove@gmail.com>
Date: Mon, 16 Dec 2019 16:28:43 +0530
Subject: [PATCH] Fix #13864 - prevent resetting of enum fields

Fixes: #13864

Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com>
---
 js/table/change.js | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/js/table/change.js b/js/table/change.js
index bd7d4ba420..a827e99643 100644
--- a/js/table/change.js
+++ b/js/table/change.js
@@ -599,6 +599,16 @@ function addNewContinueInsertionFiels (event) {
             $anchor.attr('href', newHref);
         };
 
+        var restoreValue = function () {
+            if ($(this).closest('tr').find('span.column_type').html() === 'enum') {
+                if ($(this).val() === $checkedValue) {
+                    $(this).prop('checked', true);
+                } else {
+                    $(this).prop('checked', false);
+                }
+            }
+        };
+
         while (currRows < targetRows) {
             /**
              * @var $last_row    Object referring to the last row
@@ -609,6 +619,7 @@ function addNewContinueInsertionFiels (event) {
             // (also needs improvement because it should be calculated
             //  just once per cloned row, not once per column)
             var newRowIndex = 0;
+            var $checkedValue = $lastRow.find('input:checked').val();
 
             // Clone the insert tables
             $lastRow
@@ -620,6 +631,22 @@ function addNewContinueInsertionFiels (event) {
                 .find('.foreign_values_anchor')
                 .each(tempReplaceAnchor);
 
+            var $oldRow = $lastRow.find('.textfield');
+            $oldRow.each(restoreValue);
+
+            // set the value of enum field of new row to default
+            var $newRow = $('#insertForm').find('.insertRowTable:last');
+            $newRow.find('.textfield').each(function () {
+                if ($(this).closest('tr').find('span.column_type').html() === 'enum') {
+                    if ($(this).val() === $(this).closest('tr').find('span.default_value').html()) {
+                        $(this).prop('checked', true);
+                    } else {
+                        $(this).prop('checked', false);
+                    }
+                }
+            });
+
+
             // Insert/Clone the ignore checkboxes
             if (currRows === 1) {
                 $('<input id="insert_ignore_1" type="checkbox" name="insert_ignore_1" checked="checked">')
@@ -667,15 +694,6 @@ function addNewContinueInsertionFiels (event) {
                 $(this).attr('tabindex', tabIndex);
                 // update the IDs of textfields to ensure that they are unique
                 $(this).attr('id', 'field_' + tabIndex + '_3');
-
-                // special handling for radio fields after updating ids to unique
-                if ($(this).closest('tr').find('span.column_type').html() === 'enum') {
-                    if ($(this).val() === $(this).closest('tr').find('span.default_value').html()) {
-                        $(this).prop('checked', true);
-                    } else {
-                        $(this).prop('checked', false);
-                    }
-                }
             });
         $('.control_at_footer')
             .each(function () {