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

NIFI-1268: - In some environments it appears as though the row selection event is triggering when there is no items in the table. Verifying the item was found prior to continuing. 

Signed-off-by: Aldrin Piri <aldrin@apache.org>
This commit is contained in:
Matt Gilman 2015-12-07 17:40:20 -05:00 committed by Aldrin Piri
parent 46623c2bf3
commit ee7eeb0493
2 changed files with 39 additions and 33 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/js/nf/canvas/nf-canvas-toolbox.js
View File

@ -931,6 +931,7 @@ nf.CanvasToolbox = (function () {
var processorType = processorTypesGrid.getDataItem(processorTypeIndex); var processorType = processorTypesGrid.getDataItem(processorTypeIndex);
// set the processor type description // set the processor type description
if (nf.Common.isDefinedAndNotNull(processorType)) {
if (nf.Common.isBlank(processorType.description)) { if (nf.Common.isBlank(processorType.description)) {
$('#processor-type-description').attr('title', '').html('<span class="unset">No description specified</span>'); $('#processor-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
} else { } else {
@ -942,6 +943,7 @@ nf.CanvasToolbox = (function () {
$('#selected-processor-name').text(processorType.label); $('#selected-processor-name').text(processorType.label);
$('#selected-processor-type').text(processorType.type); $('#selected-processor-type').text(processorType.type);
} }
}
}); });
// wire up the dataview to the grid // wire up the dataview to the grid

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
View File

@ -414,6 +414,7 @@ nf.Settings = (function () {
var controllerServiceType = controllerServiceTypesGrid.getDataItem(controllerServiceTypeIndex); var controllerServiceType = controllerServiceTypesGrid.getDataItem(controllerServiceTypeIndex);
// set the controller service type description // set the controller service type description
if (nf.Common.isDefinedAndNotNull(controllerServiceType)) {
if (nf.Common.isBlank(controllerServiceType.description)) { if (nf.Common.isBlank(controllerServiceType.description)) {
$('#controller-service-type-description').attr('title', '').html('<span class="unset">No description specified</span>'); $('#controller-service-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
} else { } else {
@ -428,6 +429,7 @@ nf.Settings = (function () {
// show the selected controller service // show the selected controller service
$('#controller-service-description-container').show(); $('#controller-service-description-container').show();
} }
}
}); });
controllerServiceTypesGrid.onDblClick.subscribe(function (e, args) { controllerServiceTypesGrid.onDblClick.subscribe(function (e, args) {
var controllerServiceType = controllerServiceTypesGrid.getDataItem(args.row); var controllerServiceType = controllerServiceTypesGrid.getDataItem(args.row);
@ -1110,6 +1112,7 @@ nf.Settings = (function () {
var reportingTaskType = reportingTaskTypesGrid.getDataItem(reportingTaskTypeIndex); var reportingTaskType = reportingTaskTypesGrid.getDataItem(reportingTaskTypeIndex);
// set the reporting task type description // set the reporting task type description
if (nf.Common.isDefinedAndNotNull(reportingTaskType)) {
if (nf.Common.isBlank(reportingTaskType.description)) { if (nf.Common.isBlank(reportingTaskType.description)) {
$('#reporting-task-type-description').attr('title', '').html('<span class="unset">No description specified</span>'); $('#reporting-task-type-description').attr('title', '').html('<span class="unset">No description specified</span>');
} else { } else {
@ -1124,6 +1127,7 @@ nf.Settings = (function () {
// show the selected reporting task // show the selected reporting task
$('#reporting-task-description-container').show(); $('#reporting-task-description-container').show();
} }
}
}); });
reportingTaskTypesGrid.onDblClick.subscribe(function (e, args) { reportingTaskTypesGrid.onDblClick.subscribe(function (e, args) {
var reportingTaskType = reportingTaskTypesGrid.getDataItem(args.row); var reportingTaskType = reportingTaskTypesGrid.getDataItem(args.row);