Repository: nifi Updated Branches: refs/heads/master 83ee7590a -> f0c6739a1
NIFI-3251: - Ensuring read permissions to the ControllerService before attempting to check permissions to parent. This closes #1483 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f0c6739a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f0c6739a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f0c6739a Branch: refs/heads/master Commit: f0c6739a1f826813820b94455039692fd680d654 Parents: 83ee759 Author: Matt Gilman <[email protected]> Authored: Wed Feb 8 09:35:35 2017 -0500 Committer: Scott Aslan <[email protected]> Committed: Wed Feb 8 15:13:20 2017 -0500 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-controller-services.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f0c6739a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js index 942df0e..460582c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js @@ -678,10 +678,10 @@ nf.ControllerServices = (function () { if (dataContext.component.persistsState === true) { markup += '<div title="View State" class="pointer view-state-controller-service fa fa-tasks" style="margin-top: 2px; margin-right: 3px;" ></div>'; } - } - if (dataContext.permissions.canWrite && canWriteControllerServiceParent(dataContext)) { - markup += '<div class="pointer delete-controller-service fa fa-trash" title="Remove" style="margin-top: 2px; margin-right: 3px;" ></div>'; + if (canWriteControllerServiceParent(dataContext)) { + markup += '<div class="pointer delete-controller-service fa fa-trash" title="Remove" style="margin-top: 2px; margin-right: 3px;" ></div>'; + } } // allow policy configuration conditionally
