You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2019/09/06 18:15:52 UTC
[nifi] branch master updated: NIFI-6637 - Display Parameter Context
Id on Update Parameter Context dialog.
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 7af710f NIFI-6637 - Display Parameter Context Id on Update Parameter Context dialog.
7af710f is described below
commit 7af710f168716767706dc6bcade3a35f3c68ea9c
Author: Rob Fellows <ro...@gmail.com>
AuthorDate: Fri Sep 6 10:26:35 2019 -0400
NIFI-6637 - Display Parameter Context Id on Update Parameter Context dialog.
This closes #3701
---
.../WEB-INF/partials/canvas/new-parameter-context-dialog.jsp | 6 ++++++
.../src/main/webapp/js/nf/canvas/nf-parameter-contexts.js | 11 +++++++++++
2 files changed, 17 insertions(+)
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 1d56304..dd531838 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
@@ -22,6 +22,12 @@
<div id="parameter-context-tabs-content">
<div id="parameter-context-standard-settings-tab-content" class="configuration-tab">
<div class="settings-left">
+ <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>
+ </div>
<div class="setting">
<div class="setting-name">Name</div>
<div id="parameter-context-name-container" class="setting-field">
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 88399a2..a4561cf 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
@@ -2170,6 +2170,11 @@
$('#new-parameter-context').on('click', function () {
resetUsage();
+ // new parameter contexts do not have an ID to show
+ if (!$('#parameter-context-id-setting').hasClass('hidden')) {
+ $('#parameter-context-id-setting').addClass('hidden');
+ }
+
$('#parameter-context-dialog').modal('setHeaderText', 'Add Parameter Context').modal('setButtonModel', [{
buttonText: 'Apply',
color: {
@@ -2316,6 +2321,12 @@
$('#parameter-context-name').val(parameterContextEntity.component.name);
$('#parameter-context-description-field').val(parameterContextEntity.component.description);
+ // show the parameter context id
+ if ($('#parameter-context-id-setting').hasClass('hidden')) {
+ $('#parameter-context-id-setting').removeClass('hidden');
+ }
+ $('#parameter-context-id-field').text(parameterContextEntity.id);
+
loadParameters(parameterContextEntity);
// show the context