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 2014/12/09 21:59:28 UTC
incubator-nifi git commit: NIFI-42: - Using displayName where
appropriate. - Ensuring descriptor exists before attempting to use a default
value.
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 63e80d3fd -> 386144695
NIFI-42:
- Using displayName where appropriate.
- Ensuring descriptor exists before attempting to use a default value.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/38614469
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/38614469
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/38614469
Branch: refs/heads/develop
Commit: 386144695831197aef7f1448350be60efbdf1f2f
Parents: 63e80d3
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Dec 9 15:58:32 2014 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Dec 9 15:58:32 2014 -0500
----------------------------------------------------------------------
.../js/nf/canvas/nf-processor-property-table.js | 10 +++++-----
.../src/main/webapp/js/nf/nf-processor-details.js | 16 ++++++++++------
2 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/38614469/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
index b5bfb79..d5ff1c4 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
@@ -475,11 +475,11 @@ nf.ProcessorPropertyTable = (function () {
// use the display name if possible
displayName = descriptor.displayName;
- }
-
- // determine the value
- if (nf.Common.isUndefined(value) || nf.Common.isNull(value)) {
- value = descriptor.defaultValue;
+
+ // determine the value
+ if (nf.Common.isUndefined(value) || nf.Common.isNull(value)) {
+ value = descriptor.defaultValue;
+ }
}
// add the row
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/38614469/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
index f27fc7a..8daff9a 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
@@ -462,6 +462,7 @@ nf.ProcessorDetails = (function () {
// determine the property type
var type = 'userDefined';
+ var displayName = name;
if (nf.Common.isDefinedAndNotNull(descriptor)) {
if (descriptor.required === true) {
type = 'required';
@@ -470,17 +471,20 @@ nf.ProcessorDetails = (function () {
} else {
type = 'optional';
}
- }
-
- // determine the value
- if (nf.Common.isUndefined(value) || nf.Common.isNull(value)) {
- value = descriptor.defaultValue;
+
+ // use the display name if possible
+ displayName = descriptor.displayName;
+
+ // determine the value
+ if (nf.Common.isUndefined(value) || nf.Common.isNull(value)) {
+ value = descriptor.defaultValue;
+ }
}
// add the row
propertyData.addItem({
id: i++,
- property: name,
+ property: displayName,
value: value,
type: type
});