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

NIFI-582: 

- Removed the term 'source' when describing an ID as it could be confusing when the component is a connection (which has properties for source/destination id).
This commit is contained in:
Matt Gilman 2015-06-02 08:57:50 -04:00
parent 84e56f2ef5
commit f2894edadc
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
View File

@ -132,7 +132,7 @@
#history-filter-dialog { #history-filter-dialog {
display: none; display: none;
width: 454px; width: 421px;
height: 250px; height: 250px;
z-index: 1301; z-index: 1301;
} }
@ -160,7 +160,7 @@
} }
#history-filter-type { #history-filter-type {
width: 127px; width: 96px;
height: 18px; height: 18px;
line-height: 18px; line-height: 18px;
float: left; float: left;

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

@ -99,10 +99,10 @@ nf.BulletinBoard = (function () {
text: 'by message', text: 'by message',
value: 'message' value: 'message'
}, { }, {
text: 'by source name', text: 'by name',
value: 'sourceName' value: 'sourceName'
}, { }, {
text: 'by source id', text: 'by id',
value: 'sourceId' value: 'sourceId'
}, { }, {
text: 'by group id', text: 'by group id',

13
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
View File

@ -69,11 +69,13 @@ nf.HistoryTable = (function () {
// filter type // filter type
$('#history-filter-type').combo({ $('#history-filter-type').combo({
options: [{ options: [{
text: 'by source id', text: 'by id',
value: 'by source id' value: 'by id',
description: 'Filters based on the id of the component that was modified'
}, { }, {
text: 'by user', text: 'by user',
value: 'by user' value: 'by user',
description: 'Filters based on the user that performed the action'
}] }]
}); });
@ -106,7 +108,7 @@ nf.HistoryTable = (function () {
var filterText = $('#history-filter').val(); var filterText = $('#history-filter').val();
if (filterText !== '') { if (filterText !== '') {
var filterType = $('#history-filter-type').combo('getSelectedOption').text; var filterType = $('#history-filter-type').combo('getSelectedOption').text;
if (filterType === 'by source id') { if (filterType === 'by id') {
filter['sourceId'] = filterText; filter['sourceId'] = filterText;
} else if (filterType === 'by user') { } else if (filterType === 'by user') {
filter['userName'] = filterText; filter['userName'] = filterText;
@ -228,6 +230,9 @@ nf.HistoryTable = (function () {
// clear the current filter // clear the current filter
$('#clear-history-filter').click(function () { $('#clear-history-filter').click(function () {
// clear the filter dialog
$('#history-filter').val('');
// hide the overview // hide the overview
$('#history-filter-overview').hide(); $('#history-filter-overview').hide();