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

[NIFI-6292] update variables slickgrid table row ids 

This closes #3469
This commit is contained in:
Scott Aslan 2019-05-10 18:30:34 -04:00 committed by Matt Gilman
parent 535d65370f
commit 95fd14866e
No known key found for this signature in database
GPG Key ID: DF61EC19432AEE37
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
View File

@ -1077,6 +1077,8 @@
return false;
};
var variablesCount = 0;
/**
* Loads the specified variable registry.
*
@ -1085,7 +1087,6 @@
*/
var loadVariables = function (variableRegistry, variableToSelect) {
if (nfCommon.isDefinedAndNotNull(variableRegistry)) {
var count = 0;
var index = 0;
var variableGrid = $('#variable-registry-table').data('gridInstance');
@ -1098,7 +1099,7 @@
$.each(variableRegistry.variables, function (i, variableEntity) {
var variable = variableEntity.variable;
variables.push({
id: count++,
id: variablesCount++,
hidden: false,
canWrite: variableEntity.canWrite,
name: variable.name,
@ -1452,9 +1453,8 @@
if (matchingVariable === null) {
// add a row for the new variable
var id = variableData.getLength();
variableData.addItem({
id: id,
id: variablesCount,
hidden: false,
canWrite: true,
name: variableName,
@ -1476,9 +1476,10 @@
variableData.reSort();
// select the new variable row
var row = variableData.getRowById(id);
var row = variableData.getRowById(variablesCount);
variableGrid.setActiveCell(row, variableGrid.getColumnIndex('value'));
variableGrid.editActiveCell();
variablesCount++
} else {
// if this row is currently hidden, clear the value and show it
if (matchingVariable.hidden === true) {
@ -1654,4 +1655,4 @@
return showVariables(processGroupId);
}
};
}));
}));