You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2018/05/22 16:00:10 UTC
[2/2] nifi git commit: NIFI-5186: - Addressing sort issue discovered
during PR.
NIFI-5186:
- Addressing sort issue discovered during PR.
This closes #2722
Signed-off-by: Scott Aslan <sc...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0305ca0f
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0305ca0f
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0305ca0f
Branch: refs/heads/master
Commit: 0305ca0fb8ed6968458d2ced8453da0bee12e0d5
Parents: 568288d
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue May 22 10:34:50 2018 -0400
Committer: Scott Aslan <sc...@gmail.com>
Committed: Tue May 22 11:05:35 2018 -0400
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-controller-services.js | 4 ++--
.../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/0305ca0f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
index c15d1ab..0848459 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
@@ -823,9 +823,9 @@
aState = nfCommon.isDefinedAndNotNull(a.component[sortDetails.columnId]) ? a.component[sortDetails.columnId] : '';
}
var bState;
- if (a.component.validationStatus === 'VALIDATING') {
+ if (b.component.validationStatus === 'VALIDATING') {
bState = 'Validating';
- } else if (a.component.validationStatus === 'INVALID') {
+ } else if (b.component.validationStatus === 'INVALID') {
bState = 'Invalid';
} else {
bState = nfCommon.isDefinedAndNotNull(b.component[sortDetails.columnId]) ? b.component[sortDetails.columnId] : '';
http://git-wip-us.apache.org/repos/asf/nifi/blob/0305ca0f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
index 198f62a..8c49a4d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
@@ -273,9 +273,9 @@
aState = nfCommon.isDefinedAndNotNull(a.component[sortDetails.columnId]) ? a.component[sortDetails.columnId] : '';
}
var bState;
- if (a.component.validationStatus === 'VALIDATING') {
+ if (b.component.validationStatus === 'VALIDATING') {
bState = 'Validating';
- } else if (a.component.validationStatus === 'INVALID') {
+ } else if (b.component.validationStatus === 'INVALID') {
bState = 'Invalid';
} else {
bState = nfCommon.isDefinedAndNotNull(b.component[sortDetails.columnId]) ? b.component[sortDetails.columnId] : '';