Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9619 from birarda/bug/domain-settings-save-row

Browse source 
fix for default value insertion in domain server settings
This commit is contained in:
Seth Alves 2017-02-07 15:40:30 -08:00 committed by GitHub
commit d75512f680
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
domain-server/resources/web/settings/js/settings.js
View file

@ -1306,7 +1306,9 @@ function badgeSidebarForDifferences(changedElement) {
var isGrouped = $('#' + panelParentID).hasClass('grouped'); var isGrouped = $('#' + panelParentID).hasClass('grouped');
if (isGrouped) { if (isGrouped) {
var initialPanelJSON = Settings.initialValues[panelParentID]; var initialPanelJSON = Settings.initialValues[panelParentID]
? Settings.initialValues[panelParentID]
: {};
// get a JSON representation of that section // get a JSON representation of that section
var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID]; var panelJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID];
@ -1417,7 +1419,7 @@ function addTableRow(row) {
input_clone.children('td').each(function () { input_clone.children('td').each(function () {
if ($(this).attr("name") !== keepField) { if ($(this).attr("name") !== keepField) {
$(this).find("input").val($(this).attr('data-default')); $(this).find("input").val($(this).children('input').attr('data-default'));
} }
}); });
@ -1595,7 +1597,11 @@ function updateDataChangedForSiblingRows(row, forceTrue) {
// get a JSON representation of that section // get a JSON representation of that section
var panelSettingJSON = form2js(panelParentID, ".", false, cleanupFormValues, true)[panelParentID][tableShortName] 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 // if they are equal, we don't need data-changed
isTrue = !_.isEqual(panelSettingJSON, initialPanelSettingJSON) isTrue = !_.isEqual(panelSettingJSON, initialPanelSettingJSON)