You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2020/09/17 22:09:03 UTC

[nifi] 08/15: NIFI-7742: remove defined and null check

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

joewitt pushed a commit to branch support/nifi-1.12.x
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 51a3cf480571b272b1e9805f611e062b490341e5
Author: Shane Ardell <sh...@gmail.com>
AuthorDate: Fri Sep 11 17:21:20 2020 -0400

    NIFI-7742: remove defined and null check
    
    This closes #4524
    
    Signed-off-by: Scott Aslan <sc...@gmail.com>
---
 .../canvas/controllers/nf-ng-canvas-flow-status-controller.js  | 10 ++++------
 1 file changed, 4 insertions(+), 6 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 5595803..4de9712 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
@@ -319,13 +319,11 @@
                                     break;
                                 case 'controller service':
                                     var group = item.parentGroup;
-                                    if (nfCommon.isDefinedAndNotNull(group.id)) {
-                                        nfProcessGroup.enterGroup(group.id).done(function () {
-                                            nfProcessGroupConfiguration.showConfiguration(group.id).done(function () {
-                                                nfProcessGroupConfiguration.selectControllerService(item.id);
-                                            });
+                                    nfProcessGroup.enterGroup(group.id).done(function () {
+                                        nfProcessGroupConfiguration.showConfiguration(group.id).done(function () {
+                                            nfProcessGroupConfiguration.selectControllerService(item.id);
                                         });
-                                    }
+                                    });
                                     break;
                                 default:
                                     var group = item.parentGroup;