Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-6587 - Fix: Unable save sensitive property value that equals masked value 

This closes #3778

Signed-off-by: Scott Aslan <scottyaslan@gmail.com>
This commit is contained in:
Rob Fellows 2019-09-30 11:17:16 -04:00 committed by Scott Aslan
parent 8132d182c7
commit 2493665c27
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js
View File

@ -958,6 +958,11 @@
} else {
// value is not sensitive or it is sensitive and the user has changed it then always take the current value
serializedValue = value;
// if the param is sensitive and the param value has not "changed", that means it matches the mask and it should still be considered changed
if (!hasChanged && !_.isEmpty(parameter) && parameter.sensitive === true && parameter.isNew === false) {
hasChanged = true;
}
}
} else {
if (isChecked) {
@ -1610,15 +1615,7 @@
e.stopImmediatePropagation();
} else if (target.hasClass('edit-parameter')) {
var closeHandler = function () {
$('#parameter-name').val('');
$('#parameter-value-field').val('');
$('#parameter-description-field').val('');
$('#parameter-sensitive-radio-button').prop('checked', false);
$('#parameter-not-sensitive-radio-button').prop('checked', false);
$('#parameter-name').prop('disabled', false);
$('#parameter-sensitive-radio-button').prop('disabled', false);
$('#parameter-not-sensitive-radio-button').prop('disabled', false);
$('#parameter-set-empty-string-field').removeClass('checkbox-checked').addClass('checkbox-unchecked');
resetParameterDialog();
};
var openHandler = function () {