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:07:29 UTC
[nifi] 09/12: NIFI-6506 - review feedback
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 a52d17628a0ebfab6ca749abf546a9e5e0875eff
Author: Rob Fellows <ro...@gmail.com>
AuthorDate: Wed Sep 4 13:43:13 2019 -0400
NIFI-6506 - review feedback
---
.../webapp/js/nf/canvas/nf-parameter-contexts.js | 25 +++++++++-------------
1 file changed, 10 insertions(+), 15 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 d7429f7..7764410 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
@@ -888,14 +888,6 @@
// validate the parameter is not a duplicate
var matchingParameter = _.find(existingParameters, { name: parameter.name });
- // If in edit mode, the value can not be null
- if (editMode === true && _.isNil(parameter.value)) {
- nfDialog.showOkDialog({
- headerText: 'Configuration Error',
- dialogContent: 'The value of the parameter must be specified.'
- });
- }
-
// Valid if no duplicate is found or it is edit mode and a matching parameter was found
if (_.isNil(matchingParameter) || (editMode === true && !_.isNil(matchingParameter))) {
return true;
@@ -1183,7 +1175,7 @@
component: updateRequestEntity.request.parameterContext
});
- var item = parameterContextData.getItemById(parameterContextEntity.component.id);
+ var item = parameterContextData.getItemById(parameterContextEntity.id);
if (nfCommon.isDefinedAndNotNull(item)) {
parameterContextData.updateItem(parameterContextEntity.id, parameterContextEntity);
}
@@ -1615,11 +1607,14 @@
},
disabled: function () {
var param = serializeParameter(parameter);
- if (_.isEmpty(param.value) && !param.isEmptyStringSet && !param.sensitive) {
- // must have a value when editing
- return true;
+ if (param.hasValueChanged) {
+ if (_.isEmpty(param.value) && !param.isEmptyStringSet) {
+ // must have a value when editing
+ return true;
+ }
+ return false;
} else {
- return !param.hasValueChanged && !param.hasDescriptionChanged;
+ return !param.hasDescriptionChanged;
}
},
handler: {
@@ -1825,8 +1820,8 @@
$(this).modal('hide');
}
}
- }]).modal('show');
- $('#parameter-dialog').modal('show');
+ }])
+ .modal('show');
});
$('#parameter-context-name').on('keyup', function (evt) {