Project

General

Profile

« Previous | Next » 

Revision 8347a5ef

Added by Ori Rabin over 8 years ago

Fixes #10731 - Allow matches to merge with default values

View differences:

app/assets/javascripts/lookup_keys.js
var fields = reloadedItem.closest('.fields');
var mergeOverrides = fields.find("[id$='_merge_overrides']");
var avoidDuplicates = fields.find("[id$='_avoid_duplicates']");
var overrideMergeDiv = fields.find("[id$='lookup_key_override_merge']");
var mergeDefault = fields.find("[id$='_merge_default']");
var validators = fields.find("[id^='optional_input_validators']");
changeCheckboxEnabledStatus(mergeOverrides, keyType == 'array' || keyType == 'hash');
changeCheckboxEnabledStatus(avoidDuplicates, keyType == 'array' && $(mergeOverrides).attr('checked') == 'checked');
overrideMergeDiv.toggle(keyType == 'array' || keyType == 'hash');
var mergeOverrideChecked = $(mergeOverrides).attr('checked') == 'checked';
changeCheckboxEnabledStatus(avoidDuplicates, keyType == 'array' && mergeOverrideChecked);
changeCheckboxEnabledStatus(mergeDefault, mergeOverrideChecked);
validators.collapse('show');
validators.parent().find('legend').removeClass('collapsed');
}
......
var fields = $(item).closest('.fields');
var keyType = fields.find("[id$='_key_type']").val();
var avoidDuplicates = fields.find("[id$='_avoid_duplicates']");
var mergeDefault = fields.find("[id$='_merge_default']");
changeCheckboxEnabledStatus(avoidDuplicates, keyType == 'array' && item.checked);
changeCheckboxEnabledStatus(mergeDefault, item.checked);
}
function toggleUsePuppetDefaultValue(item, value_field) {

Also available in: Unified diff