This is an automated email from the ASF dual-hosted git repository. scottyaslan pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 29708d836257f152d7893bc11fea0ebb24555538 Author: Rob Fellows <[email protected]> AuthorDate: Tue Sep 10 10:02:34 2019 -0400 NIFI-6641 - fix issue with dialog state when adding a new parameter context. added ellipsis styling and titles to name and id fields. This closes #3710 Signed-off-by: Scott Aslan <[email protected]> --- .../WEB-INF/partials/canvas/new-parameter-context-dialog.jsp | 4 ++-- .../src/main/webapp/js/nf/canvas/nf-parameter-contexts.js | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-parameter-context-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-parameter-context-dialog.jsp index cba63e0..88d0063 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-parameter-context-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-parameter-context-dialog.jsp @@ -25,14 +25,14 @@ <div id="parameter-context-id-setting" class="setting hidden"> <div class="setting-name">Id</div> <div class="setting-field"> - <div id="parameter-context-id-field"></div> + <div id="parameter-context-id-field" class="ellipsis"></div> </div> </div> <div class="setting"> <div class="setting-name">Name</div> <div id="parameter-context-name-container" class="setting-field"> <input type="text" id="parameter-context-name" class="edit-mode" name="parameter-context-name"/> - <div id="parameter-context-name-read-only" class="read-only"></div> + <div id="parameter-context-name-read-only" class="read-only ellipsis"></div> </div> </div> <div class="setting"> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js index eee4146..3e0f44f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-parameter-contexts.js @@ -2205,6 +2205,10 @@ $('#parameter-context-id-setting').addClass('hidden'); } + // make sure this dialog is not in read-only mode + $('#parameter-context-dialog').removeClass('read-only'); + $('#parameter-context-dialog').addClass('edit-mode'); + $('#parameter-context-dialog').modal('setHeaderText', 'Add Parameter Context').modal('setButtonModel', [{ buttonText: 'Apply', color: { @@ -2364,7 +2368,9 @@ } else { $('#parameter-context-dialog').removeClass('edit-mode'); $('#parameter-context-dialog').addClass('read-only'); - $('#parameter-context-name-read-only').text(parameterContextEntity.component.name); + $('#parameter-context-name-read-only') + .prop('title', parameterContextEntity.component.name) + .text(parameterContextEntity.component.name); $('#parameter-context-description-read-only').text(parameterContextEntity.component.description); } @@ -2372,7 +2378,9 @@ if ($('#parameter-context-id-setting').hasClass('hidden')) { $('#parameter-context-id-setting').removeClass('hidden'); } - $('#parameter-context-id-field').text(parameterContextEntity.id); + $('#parameter-context-id-field') + .prop('title', parameterContextEntity.id) + .text(parameterContextEntity.id); loadParameters(parameterContextEntity, null, readOnly);
