From 3311df5e1f5b99f1971e59a8c362d8f1f5e6e0f3 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 6 Feb 2017 14:23:37 -0800 Subject: [PATCH 1/2] fix default value in new row --- domain-server/resources/web/settings/js/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js index 3ed7d02364..4f8ca0eec4 100644 --- a/domain-server/resources/web/settings/js/settings.js +++ b/domain-server/resources/web/settings/js/settings.js @@ -1417,7 +1417,7 @@ function addTableRow(row) { input_clone.children('td').each(function () { if ($(this).attr("name") !== keepField) { - $(this).find("input").val($(this).attr('data-default')); + $(this).find("input").val($(this).children('input').attr('data-default')); } }); From 5c46cecf6a28d24ebadbca16fcdd412e1488dfcf Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 6 Feb 2017 14:32:02 -0800 Subject: [PATCH 2/2] handle empty initial groups when comparing --- domain-server/resources/web/settings/js/settings.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js index 4f8ca0eec4..c5f055bed0 100644 --- a/domain-server/resources/web/settings/js/settings.js +++ b/domain-server/resources/web/settings/js/settings.js @@ -1306,7 +1306,9 @@ function badgeSidebarForDifferences(changedElement) { var isGrouped = $('#' + panelParentID).hasClass('grouped'); if (isGrouped) { - var initialPanelJSON = Settings.initialValues[panelParentID]; + var initialPanelJSON = Settings.initialValues[panelParentID] + ? Settings.initialValues[panelParentID] + : {}; // get a JSON representation of that section var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID]; @@ -1595,7 +1597,11 @@ function updateDataChangedForSiblingRows(row, forceTrue) { // get a JSON representation of that section var panelSettingJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID][tableShortName] - var initialPanelSettingJSON = Settings.initialValues[panelParentID][tableShortName] + if (Settings.initialValues[panelParentID]) { + var initialPanelSettingJSON = Settings.initialValues[panelParentID][tableShortName] + } else { + var initialPanelSettingJSON = {}; + } // if they are equal, we don't need data-changed isTrue = !_.isEqual(panelSettingJSON, initialPanelSettingJSON)