Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-11846 - Change version should not show keep existing parameter context 

This closes #7517

Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
Pierre Villard 2023-07-24 15:16:30 +02:00 committed by exceptionfactory
parent 3103c9def9
commit 969679e43b
No known key found for this signature in database
GPG Key ID: 29B6A52D2AAE8DBA
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/import-flow-version-dialog.jsp
View File

@ -45,7 +45,7 @@
<div id="import-flow-version-label"></div> <div id="import-flow-version-label"></div>
</div> </div>
</div> </div>
<div class="setting keep-parameter-context"> <div id="keep-parameter-context-container" class="setting keep-parameter-context">
<div id="keepExistingParameterContext" class="nf-checkbox checkbox-checked"></div> <div id="keepExistingParameterContext" class="nf-checkbox checkbox-checked"></div>
<div class="nf-checkbox-label">Keep Existing Parameter Contexts</div> <div class="nf-checkbox-label">Keep Existing Parameter Contexts</div>
<div class="fa fa-question-circle" alt="Info" title="When not selected, only directly associated Parameter Contexts will be copied, inherited Contexts with no direct assignment to a Process Group are ignored."></div> <div class="fa fa-question-circle" alt="Info" title="When not selected, only directly associated Parameter Contexts will be copied, inherited Contexts with no direct assignment to a Process Group are ignored."></div>

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
View File

@ -175,6 +175,8 @@
$('#import-flow-version-container').hide(); $('#import-flow-version-container').hide();
$('#import-flow-version-label').text(''); $('#import-flow-version-label').text('');
$('#keep-parameter-context-container').hide();
}; };
/** /**
@ -782,6 +784,9 @@
}] }]
}).show(); }).show();
// show the checkbox to keep existing parameter context
$('#keep-parameter-context-container').show();
loadRegistries($('#import-flow-version-dialog'), registryCombo, bucketCombo, flowCombo, selectBucketImportVersion, function (bucketEntity) { loadRegistries($('#import-flow-version-dialog'), registryCombo, bucketCombo, flowCombo, selectBucketImportVersion, function (bucketEntity) {
return true; return true;
}).done(function () { }).done(function () {
@ -1925,6 +1930,9 @@
$('#import-flow-version-container').show(); $('#import-flow-version-container').show();
$('#import-flow-version-label').text(versionControlInformation.version); $('#import-flow-version-label').text(versionControlInformation.version);
// hide the checkbox to keep existing parameter context
$('#keep-parameter-context-container').hide();
// record the versionControlInformation // record the versionControlInformation
$('#import-flow-version-process-group-id').data('versionControlInformation', versionControlInformation).data('revision', groupVersionControlInformation.processGroupRevision).text(processGroupId); $('#import-flow-version-process-group-id').data('versionControlInformation', versionControlInformation).data('revision', groupVersionControlInformation.processGroupRevision).text(processGroupId);