[nifi] branch main updated: NIFI-12250: (#7908)

[markap14]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 98eef74dd8 NIFI-12250: (#7908)
98eef74dd8 is described below

commit 98eef74dd84952f2a6ae7793277d80985ab16b99
Author: Matt Gilman <matt.c.gil...@gmail.com>
AuthorDate: Thu Oct 19 15:53:07 2023 -0400

    NIFI-12250: (#7908)
    
    - Fixing issue where the registry configuration dialog was being 
initialized twice.
---
 .../src/main/webapp/js/nf/canvas/nf-settings.js    | 39 ++++++++--------------
 1 file changed, 13 insertions(+), 26 deletions(-)

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 f68448f127..0b71333757 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
@@ -1192,19 +1192,6 @@
                 }
             }
         });
-
-        // initialize the registry configuration dialog
-        $('#registry-configuration-dialog').modal({
-            scrollableContentStyle: 'scrollable',
-            handler: {
-                close: function () {
-                    $('#registry-id-config').text('');
-                    $('#registry-name-config').val('');
-                    $('#registry-type-config').val('');
-                    $('#registry-description-config').val('');
-                }
-            }
-        });
     };
 
     /**
@@ -2504,19 +2491,6 @@
                 }
             }
         });
-
-        // initialize the registry configuration dialog
-        $('#registry-configuration-dialog').modal({
-            scrollableContentStyle: 'scrollable',
-            handler: {
-                close: function () {
-                    $('#registry-id').text('');
-                    $('#registry-name').val('');
-                    $('#registry-location').val('');
-                    $('#registry-description').val('');
-                }
-            }
-        });
     };
 
     /**
@@ -3902,6 +3876,19 @@
                 }
             });
 
+            // initialize the registry configuration dialog
+            $('#registry-configuration-dialog').modal({
+                scrollableContentStyle: 'scrollable',
+                handler: {
+                    close: function () {
+                        $('#registry-id-config').text('');
+                        $('#registry-name-config').val('');
+                        $('#registry-type-config').val('');
+                        $('#registry-description-config').val('');
+                    }
+                }
+            });
+
             // initialize each tab
             initGeneral();
             nfControllerServices.init(getControllerServicesTable(), 
nfSettings.showSettings);