Repository: nifi Updated Branches: refs/heads/master 89eb2ce28 -> aa8ba0bd1
NIFI-2965: - Ensuring the selection is cleared when going to the Process Group where the selected component policy is defined. - Ensure that the selection context is updated when going to a component or group. This closes #1174. Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/aa8ba0bd Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/aa8ba0bd Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/aa8ba0bd Branch: refs/heads/master Commit: aa8ba0bd1ceaad34da3b85b8f2b727176dde0824 Parents: 89eb2ce Author: Matt Gilman <[email protected]> Authored: Wed Nov 2 16:46:16 2016 -0400 Committer: Pierre Villard <[email protected]> Committed: Tue Nov 8 14:49:12 2016 +0100 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-actions.js | 3 +++ .../src/main/webapp/js/nf/canvas/nf-policy-management.js | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/aa8ba0bd/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js index 6321df4..a9c05b8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js @@ -295,6 +295,9 @@ nf.Actions = (function () { // select only the component/connection in question selection.classed('selected', true); nf.Actions.center(selection); + + // inform Angular app that values have changed + nf.ng.Bridge.digest(); } }, http://git-wip-us.apache.org/repos/asf/nifi/blob/aa8ba0bd/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js index 01b1ed1..208c760 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js @@ -784,8 +784,16 @@ nf.PolicyManagement = (function () { // build the mark up return $('<span>Showing effective policy inherited from Process Group </span>').append($('<span class="link"></span>').text(processGroupName).on('click', function () { + // close the shell $('#shell-close-button').click(); - nf.CanvasUtils.enterGroup(processGroupId); + + // load the correct group and unselect everything if necessary + nf.CanvasUtils.enterGroup(processGroupId).done(function () { + nf.CanvasUtils.getSelection().classed('selected', false); + + // inform Angular app that values have changed + nf.ng.Bridge.digest(); + }); })).append('<span>.</span>'); } };
