From 2fb30c774cfcae39e59ea33f19ca99a2d46cc799 Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Fri, 23 Jan 2015 13:56:12 -0500 Subject: [PATCH] NIFI-301: - Ensuring when 'no value' is selected, a value of null is used which will unset the corresponding property. --- .../webapp/js/nf/canvas/nf-processor-property-combo-editor.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js index 11cd7ffc0f..e777293abd 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-combo-editor.js @@ -51,6 +51,7 @@ nf.ProcessorPropertyComboEditor = function (args) { if (propertyDescriptor.required === false) { options.push({ text: 'No value', + value: null, optionClass: 'unset' }); } @@ -68,6 +69,7 @@ nf.ProcessorPropertyComboEditor = function (args) { if (options.length === 0) { options.push({ text: 'No value', + value: null, optionClass: 'unset', disabled: true }); @@ -134,7 +136,7 @@ nf.ProcessorPropertyComboEditor = function (args) { var propertyDescriptor = processorDetails.config.descriptors[item.property]; // select as appropriate - if (nf.Common.isDefinedAndNotNull(item.value)) { + if (!nf.Common.isUndefined(item.value)) { initialValue = item.value; combo.combo('setSelectedOption', {