You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/06/02 15:07:26 UTC
incubator-nifi git commit: 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).
Repository: incubator-nifi
Updated Branches:
refs/heads/develop 84e56f2ef -> f2894edad
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).
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/f2894eda
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/f2894eda
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/f2894eda
Branch: refs/heads/develop
Commit: f2894edadc1b4a82f99d1287c9678cb54dd48f4f
Parents: 84e56f2
Author: Matt Gilman <ma...@gmail.com>
Authored: Tue Jun 2 08:57:50 2015 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Jun 2 08:57:50 2015 -0400
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/css/history.css | 4 ++--
.../webapp/js/nf/bulletin-board/nf-bulletin-board.js | 4 ++--
.../src/main/webapp/js/nf/history/nf-history-table.js | 13 +++++++++----
3 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f2894eda/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
index cb8c840..f3518d5 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
@@ -132,7 +132,7 @@
#history-filter-dialog {
display: none;
- width: 454px;
+ width: 421px;
height: 250px;
z-index: 1301;
}
@@ -160,7 +160,7 @@
}
#history-filter-type {
- width: 127px;
+ width: 96px;
height: 18px;
line-height: 18px;
float: left;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f2894eda/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
----------------------------------------------------------------------
diff --git a/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 b/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
index 85e52b0..656755e 100644
--- a/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
+++ b/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
@@ -99,10 +99,10 @@ nf.BulletinBoard = (function () {
text: 'by message',
value: 'message'
}, {
- text: 'by source name',
+ text: 'by name',
value: 'sourceName'
}, {
- text: 'by source id',
+ text: 'by id',
value: 'sourceId'
}, {
text: 'by group id',
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/f2894eda/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
index 14c97cf..1938d85 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
@@ -69,11 +69,13 @@ nf.HistoryTable = (function () {
// filter type
$('#history-filter-type').combo({
options: [{
- text: 'by source id',
- value: 'by source id'
+ text: 'by id',
+ value: 'by id',
+ description: 'Filters based on the id of the component that was modified'
}, {
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();
if (filterText !== '') {
var filterType = $('#history-filter-type').combo('getSelectedOption').text;
- if (filterType === 'by source id') {
+ if (filterType === 'by id') {
filter['sourceId'] = filterText;
} else if (filterType === 'by user') {
filter['userName'] = filterText;
@@ -228,6 +230,9 @@ nf.HistoryTable = (function () {
// clear the current filter
$('#clear-history-filter').click(function () {
+ // clear the filter dialog
+ $('#history-filter').val('');
+
// hide the overview
$('#history-filter-overview').hide();