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 2020/09/14 14:51:23 UTC

[nifi] 02/03: NIFI-7742: update case clause logic

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

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

commit 80bc40a9af3994c35d74fdbc5cb6d3c030e81037
Author: Shane Ardell <sh...@gmail.com>
AuthorDate: Fri Sep 11 16:43:24 2020 -0400

    NIFI-7742: update case clause logic
---
 .../controllers/nf-ng-canvas-flow-status-controller.js  | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
index 2e2ebc5..5595803 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
@@ -321,20 +321,9 @@
                                     var group = item.parentGroup;
                                     if (nfCommon.isDefinedAndNotNull(group.id)) {
                                         nfProcessGroup.enterGroup(group.id).done(function () {
-                                            if ($('#process-group-configuration').is(':visible')) {
-                                                nfProcessGroupConfiguration.loadConfiguration(group.id).done(function () {
-                                                    nfProcessGroupConfiguration.selectControllerService(item.id);
-                                                });
-                                            } else {
-                                                nfProcessGroupConfiguration.showConfiguration(group.id).done(function () {
-                                                    nfSettings.selectControllerService(item.id);
-                                                });
-                                            }
-                                        });
-                                    } else {
-                                        // reload the settings and show
-                                        nfSettings.showSettings().done(function () {
-                                            nfSettings.selectControllerService(item.id);
+                                            nfProcessGroupConfiguration.showConfiguration(group.id).done(function () {
+                                                nfProcessGroupConfiguration.selectControllerService(item.id);
+                                            });
                                         });
                                     }
                                     break;