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/02/06 13:53:07 UTC
incubator-nifi git commit: NIFI-250: - Including the user who last
modified the flow in the refresh tooltip.
Repository: incubator-nifi
Updated Branches:
refs/heads/NIFI-250 9f9466cb4 -> 6892f19d6
NIFI-250:
- Including the user who last modified the flow in the refresh tooltip.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/6892f19d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/6892f19d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/6892f19d
Branch: refs/heads/NIFI-250
Commit: 6892f19d61ebd4ae227b43452ba9c4303bd522eb
Parents: 9f9466c
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri Feb 6 07:52:38 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri Feb 6 07:52:38 2015 -0500
----------------------------------------------------------------------
.../src/main/webapp/js/nf/canvas/nf-canvas-header.js | 5 -----
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 12 ++++++++++++
2 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6892f19d/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
index 3b57620..34a3637 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
@@ -94,11 +94,6 @@ nf.CanvasHeader = (function () {
nf.Shell.showPage('bulletin-board');
});
- // setup the tooltip for the refresh icon
- $('#refresh-required-icon').qtip($.extend({
- content: 'This flow has been modified by another user. Please refresh.'
- }, nf.CanvasUtils.config.systemTooltipConfig));
-
// setup the refresh link actions
$('#refresh-required-link').click(function () {
nf.CanvasHeader.reloadAndClearWarnings();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/6892f19d/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
index a93a6ac..5a1ec02 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
@@ -184,6 +184,18 @@ nf.Canvas = (function () {
// insert the refresh needed text in the canvas - if necessary
if (!refreshContainer.is(':visible')) {
$('#stats-last-refreshed').addClass('alert');
+ var refreshMessage = "This flow has been modified by '" + revision.lastModifier + "'. Please refresh.";
+
+ // update the tooltip
+ var refreshRequiredIcon = $('#refresh-required-icon');
+ if (refreshRequiredIcon.data('qtip')) {
+ refreshRequiredIcon.qtip('option', 'content.text', refreshMessage);
+ } else {
+ refreshRequiredIcon.qtip($.extend({
+ content: refreshMessage
+ }, nf.CanvasUtils.config.systemTooltipConfig));
+ }
+
refreshContainer.show();
}