diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/login/login-form.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/login/login-form.jsp
index eddf76d670..9f9a6605d4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/login/login-form.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/login/login-form.jsp
@@ -18,9 +18,9 @@
Log In
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInfo.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInfo.png
new file mode 100644
index 0000000000..f192ff5724
Binary files /dev/null and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInfo.png differ
diff --git a/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
index 1f0c206599..d58f8b8c1b 100644
--- a/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
@@ -333,12 +333,14 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) {
$('#bulletin-board-last-refreshed').text(bulletinBoard.generated);
// process the bulletins
- var bulletins = response.bulletinBoard.bulletins;
+ var bulletinEntities = response.bulletinBoard.bulletins;
var content = [];
// append each bulletin
- $.each(bulletins, function (i, bulletin) {
- if (!nf.Common.isBlank(bulletin.level)) {
+ $.each(bulletinEntities, function (i, bulletinEntity) {
+ if (bulletinEntity.canRead === true) {
+ var bulletin = bulletinEntity.bulletin;
+
// format the severity
var severityStyle = 'bulletin-normal';
if (bulletin.level === 'ERROR') {
@@ -385,7 +387,7 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) {
}
// record the id of the last bulletin in this request
- if (i + 1 === bulletins.length) {
+ if (i + 1 === bulletinEntities.length) {
lastBulletin = bulletin.id;
}
});
diff --git a/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
index ab1e9e65a7..3d623896a7 100644
--- a/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js
@@ -277,7 +277,10 @@ nf.HistoryTable = (function () {
// define how general values are formatted
var valueFormatter = function (row, cell, value, columnDef, dataContext) {
- return nf.Common.formatValue(value);
+ if(dataContext.canRead !== true) {
+ return 'Not authorized';
+ }
+ return nf.Common.formatValue(dataContext.action[columnDef.field]);
};
// initialize the templates table
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
index 80e4d62ce1..a2083eb925 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
@@ -1214,10 +1214,12 @@ nf.Common = (function () {
* @argument {array} bulletins The bulletins
* @return {array} The jQuery objects
*/
- getFormattedBulletins: function (bulletins) {
- var formattedBulletins = [];
- $.each(bulletins, function (j, bulletin) {
- if (!nf.Common.isBlank(bulletin.level)) {
+ getFormattedBulletins: function (bulletinEntities) {
+ var formattedBulletinEntities = [];
+ $.each(bulletinEntities, function (j, bulletinEntity) {
+ if (bulletinEntity.canRead === true) {
+ var bulletin = bulletinEntity.bulletin;
+
// format the node address
var nodeAddress = '';
if (nf.Common.isDefinedAndNotNull(bulletin.nodeAddress)) {
@@ -1236,10 +1238,10 @@ nf.Common = (function () {
'' + nf.Common.escapeHtml(bulletin.level) + ' ' +
'
').append(bulletinMessage);
- formattedBulletins.push(formattedBulletin);
+ formattedBulletinEntities.push(formattedBulletin);
}
});
- return formattedBulletins;
+ return formattedBulletinEntities;
}
};
}());