You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/01/26 13:15:25 UTC
[11/14] incubator-nifi git commit: NIFI-301: - Ensuring when 'no
value' is selected,
a value of null is used which will unset the corresponding property.
NIFI-301:
- Ensuring when 'no value' is selected, a value of null is used which will unset the corresponding property.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2fb30c77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2fb30c77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2fb30c77
Branch: refs/heads/NIFI-250
Commit: 2fb30c774cfcae39e59ea33f19ca99a2d46cc799
Parents: 43e646e
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Jan 23 13:56:12 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Jan 23 13:56:12 2015 -0500
----------------------------------------------------------------------
.../webapp/js/nf/canvas/nf-processor-property-combo-editor.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2fb30c77/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
----------------------------------------------------------------------
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 11cd7ff..e777293 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', {