From 4587e3670e8e12c7a64464b6e81c25d279e4d57c Mon Sep 17 00:00:00 2001 From: honchar Date: Mon, 5 Jun 2017 16:51:51 +0200 Subject: [PATCH] applied new ui authorizations for Assign/Unassign menu items --- .../web/component/assignment/AssignmentTablePanel.java | 8 ++------ .../assignment/MultipleAssignmentSelectorPanel.java | 4 +--- .../component/objectdetails/UserDelegationsTabPanel.java | 4 +--- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java index 1fd0368c6d4..ffcff76af9f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java @@ -209,9 +209,7 @@ protected List createAssignmentMenu() { List items = new ArrayList<>(); InlineMenuItem item; - // TODO: the modify authorization here is probably wrong. - // It is a model autz. UI autz should be here instead? - if (WebComponentUtil.isAuthorized(ModelAuthorizationAction.ASSIGN.getUrl())) { + if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_ASSIGN_ACTION_URI)) { item = new InlineMenuItem(createStringResource("AssignmentTablePanel.menu.assign"), new InlineMenuItemAction() { private static final long serialVersionUID = 1L; @@ -270,9 +268,7 @@ protected void assignSelectedOrgPerformed(List selectedOrgs, items.add(item); items.add(new InlineMenuItem()); } - // TODO: the modify authorization here is probably wrong. - // It is a model autz. UI autz should be here instead? - if (WebComponentUtil.isAuthorized(ModelAuthorizationAction.UNASSIGN.getUrl())) { + if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_UNASSIGN_ACTION_URI)) { item = new InlineMenuItem(createStringResource("AssignmentTablePanel.menu.unassign"), new InlineMenuItemAction() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java index 11ed07458ab..388780f9728 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/MultipleAssignmentSelectorPanel.java @@ -139,9 +139,7 @@ protected void onSubmit(AjaxRequestTarget target, org.apache.wicket.markup.html. @Override public boolean isEnabled() { - // TODO: the modify authorization here is probably wrong. - // It is a model autz. UI autz should be here instead? - return WebComponentUtil.isAuthorized(ModelAuthorizationAction.UNASSIGN.getUrl()); + return WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_UNASSIGN_ACTION_URI); } }); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java index 086dc7e973b..3058d30f4e3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/UserDelegationsTabPanel.java @@ -131,9 +131,7 @@ protected void onSelectPerformed(AjaxRequestTarget target, UserType user) { }); items.add(item); } - // TODO: the modify authorization here is probably wrong. - // It is a model autz. UI autz should be here instead? - if (WebComponentUtil.isAuthorized(ModelAuthorizationAction.UNASSIGN.getUrl())) { + if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_UNASSIGN_ACTION_URI)) { item = new InlineMenuItem(createStringResource("AssignmentTablePanel.menu.deleteDelegation"), new InlineMenuItemAction() { private static final long serialVersionUID = 1L;