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/23 20:12:05 UTC
[1/2] incubator-nifi git commit: NIFI-301: - Ensuring when 'no value'
is selected,
a value of null is used which will unset the corresponding property.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop c4dffe2ab -> 33cee9d76
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/develop
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', {
[2/2] incubator-nifi git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Posted by mc...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-nifi into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/33cee9d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/33cee9d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/33cee9d7
Branch: refs/heads/develop
Commit: 33cee9d7651c7351714fd736a10803e00fc08f23
Parents: 2fb30c7 c4dffe2
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Jan 23 14:02:35 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Jan 23 14:02:35 2015 -0500
----------------------------------------------------------------------
.../src/main/asciidoc/administration-guide.adoc | 307 +++++++++++++++++++
.../nifi-processor-bundle-archetype/pom.xml | 49 +++
.../META-INF/maven/archetype-metadata.xml | 43 +++
.../nifi-__artifactBaseName__-nar/pom.xml | 37 +++
.../pom.xml | 54 ++++
.../src/main/java/MyProcessor.java | 88 ++++++
.../org.apache.nifi.processor.Processor | 15 +
.../docs/__package__.MyProcessor/index.html | 96 ++++++
.../src/test/java/MyProcessorTest.java | 39 +++
.../main/resources/archetype-resources/pom.xml | 35 +++
nifi/nifi-maven-archetypes/pom.xml | 30 ++
.../nifi/processors/standard/PostHTTP.java | 34 +-
.../index.html | 20 ++
.../index.html | 21 ++
nifi/pom.xml | 1 +
15 files changed, 857 insertions(+), 12 deletions(-)
----------------------------------------------------------------------