[nifi] branch master updated: NIFI-6136 - fix: UI - User and Template bug when page popped out NIFI-6136 - return the appropriate value (false) when verifyDisconnectedCluster is called from a non-clustered environment.

[mcgilman]

This is an automated email from the ASF dual-hosted git repository.

mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new fb9f2af  NIFI-6136 - fix: UI - User and Template bug when page popped 
out NIFI-6136 - return the appropriate value (false) when 
verifyDisconnectedCluster is called from a non-clustered environment.
fb9f2af is described below

commit fb9f2af04afa5570f413806427319797dbff5194
Author: Rob Fellows <rob.fell...@gmail.com>
AuthorDate: Tue Mar 26 10:49:47 2019 -0400

    NIFI-6136 - fix: UI - User and Template bug when page popped out
    NIFI-6136 - return the appropriate value (false) when 
verifyDisconnectedCluster is called from a non-clustered environment.
    
    This closes #3390
---
 .../src/main/webapp/js/nf/templates/nf-templates.js            | 10 +++++++---
 .../nifi-web-ui/src/main/webapp/js/nf/users/nf-users.js        | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates.js
index 7067ed9..649d797 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates.js
@@ -95,9 +95,13 @@
                     if (clusterSummary.connectedToCluster) {
                         deferred.resolve(false);
                     } else {
-                        nfDialog.showDisconnectedFromClusterMessage(function 
() {
-                            deferred.resolve(true);
-                        });
+                        if (clusterSummary.clustered) {
+                            
nfDialog.showDisconnectedFromClusterMessage(function () {
+                                deferred.resolve(true);
+                            });
+                        } else {
+                            deferred.resolve(false);
+                        }
                     }
                 }).fail(nfErrorHandler.handleAjaxError).fail(function () {
                     deferred.reject();
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users.js
index d9c0f3b..e1534b0 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users.js
@@ -114,9 +114,13 @@
                     if (clusterSummary.connectedToCluster) {
                         deferred.resolve(false);
                     } else {
-                        nfDialog.showDisconnectedFromClusterMessage(function 
() {
-                            deferred.resolve(true);
-                        });
+                        if (clusterSummary.clustered) {
+                            
nfDialog.showDisconnectedFromClusterMessage(function () {
+                                deferred.resolve(true);
+                            });
+                        } else {
+                            deferred.resolve(false);
+                        }
                     }
                 }).fail(nfErrorHandler.handleAjaxError).fail(function () {
                     deferred.reject();