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 2019/09/05 18:55:18 UTC
[nifi] branch master updated: NIFI-6602 - Fix: Apply button should
be greyed out if no changes have been made
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
The following commit(s) were added to refs/heads/master by this push:
new 92fd312 NIFI-6602 - Fix: Apply button should be greyed out if no changes have been made
92fd312 is described below
commit 92fd3129bacf3276369a944136474cfa0f29d951
Author: Rob Fellows <ro...@gmail.com>
AuthorDate: Tue Sep 3 13:56:20 2019 -0400
NIFI-6602 - Fix: Apply button should be greyed out if no changes have been made
This closes #3691
Signed-off-by: Scott Aslan <sc...@gmail.com>
---
.../webapp/js/nf/canvas/nf-parameter-contexts.js | 24 ++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
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 f2a73c4..161bb64 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
@@ -1007,6 +1007,21 @@
};
+ var hasParameterContextChanged = function (parameterContextEntity) {
+ var parameters = marshalParameters();
+ var proposedParamContextName = $('#parameter-context-name').val();
+ var proposedParamContextDesc = $('#parameter-context-description-field').val();
+
+ if (_.isEmpty(parameters) &&
+ proposedParamContextName === _.get(parameterContextEntity, 'component.name') &&
+ proposedParamContextDesc === _.get(parameterContextEntity, 'component.description')) {
+
+ return false;
+ } else {
+ return true;
+ }
+ };
+
/**
* Updates parameter contexts by issuing an update request and polling until it's completion.
*
@@ -1060,7 +1075,7 @@
text: '#ffffff'
},
disabled: function () {
- if ($('#parameter-context-name').val() !== '') {
+ if ($('#parameter-context-name').val() !== '' && hasParameterContextChanged(parameterContextEntity)) {
return false;
}
return true;
@@ -1849,6 +1864,11 @@
$('#parameter-context-dialog').modal('refreshButtons');
});
+ $('#parameter-context-description-field').on('keyup', function (evt) {
+ // update the buttons to possibly trigger the disabled state
+ $('#parameter-context-dialog').modal('refreshButtons');
+ });
+
$('#parameter-name').on('keyup', function (evt) {
// update the buttons to possibly trigger the disabled state
$('#parameter-dialog').modal('refreshButtons');
@@ -2296,7 +2316,7 @@
text: '#ffffff'
},
disabled: function () {
- if ($('#parameter-context-name').val() !== '') {
+ if ($('#parameter-context-name').val() !== '' && hasParameterContextChanged(currentParameterContextEntity)) {
return false;
}
return true;