From 4aa32e9517f7932082e8f6b49b4f4084d7e84009 Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Mon, 30 Oct 2017 15:10:59 +0100 Subject: [PATCH] more bugfixes for attorney ui --- .../midpoint/gui/api/page/PageBase.java | 1 + .../admin/workflow/PageAttorneySelection.java | 5 ++++ .../page/admin/workflow/PageWorkItems.java | 28 +++++++++++-------- .../security/api/AuthorizationConstants.java | 2 +- 4 files changed, 23 insertions(+), 13 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java index 067fc11c470..556a37635b5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java @@ -1406,6 +1406,7 @@ protected List createMenuItems() { } if (WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_MY_WORK_ITEMS_URL, + AuthorizationConstants.AUTZ_UI_ATTORNEY_WORK_ITEMS_URL, AuthorizationConstants.AUTZ_UI_APPROVALS_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_URL, AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL)) { if (getWorkflowManager().isEnabled()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java index 21267c53f27..edce0694d07 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageAttorneySelection.java @@ -78,6 +78,11 @@ public class PageAttorneySelection extends PageBase { private static final String ID_TABLE = "table"; public PageAttorneySelection() { + this(null); + } + + public PageAttorneySelection(PageParameters parameters) { + super(parameters); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java index 1db16d26cfc..73de89da27c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItems.java @@ -26,8 +26,6 @@ import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.util.exception.ObjectNotFoundException; import com.evolveum.midpoint.util.exception.SecurityViolationException; -import com.evolveum.midpoint.util.logging.Trace; -import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.web.component.AjaxButton; import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; import com.evolveum.midpoint.web.component.wf.WorkItemsPanel; @@ -39,7 +37,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; +import org.apache.wicket.request.mapper.parameter.PageParameters; import java.util.Collections; import java.util.List; @@ -69,9 +67,9 @@ public abstract class PageWorkItems extends PageAdminWorkItems { private static final String ID_APPROVE = "approve"; private static final String ID_REJECT = "reject"; - private WorkItemsPageType workItemsType; + private WorkItemsPageType workItemsType; - private IModel> donorModel; + private IModel> donorModel; public PageWorkItems(WorkItemsPageType workItemsType) { this.workItemsType = workItemsType; @@ -103,7 +101,7 @@ private void initLayout(IModel> donorModel) { new WorkItemDtoProvider(PageWorkItems.this, workItemsType, donorModel), UserProfileStorage.TableId.PAGE_WORK_ITEMS, (int) getItemsPerPage(UserProfileStorage.TableId.PAGE_WORK_ITEMS), - WorkItemsPanel.View.FULL_LIST); + WorkItemsPanel.View.FULL_LIST); panel.setOutputMarkupId(true); mainForm.add(panel); @@ -184,7 +182,13 @@ public void onClick(AjaxRequestTarget target) { } private void backPerformed(AjaxRequestTarget target) { - setResponsePage(PageAttorneySelection.class); + PageParameters parameters = new PageParameters(); + + String oid = donorModel.getObject().getOid(); + parameters.add(OnePageParameterEncoder.PARAMETER, oid); + + PageAttorneySelection back = new PageAttorneySelection(parameters); + setResponsePage(back); } private boolean isSomeItemSelected(List items, AjaxRequestTarget target) { @@ -229,7 +233,7 @@ private void approveOrRejectWorkItemsPerformed(AjaxRequestTarget target, boolean showResult(mainResult); resetWorkItemCountModel(); - target.add(this); + target.add(this); } private void claimWorkItemsPerformed(AjaxRequestTarget target) { @@ -259,8 +263,8 @@ private void claimWorkItemsPerformed(AjaxRequestTarget target) { showResult(mainResult); - resetWorkItemCountModel(); - target.add(this); + resetWorkItemCountModel(); + target.add(this); } private void releaseWorkItemsPerformed(AjaxRequestTarget target) { @@ -290,7 +294,7 @@ private void releaseWorkItemsPerformed(AjaxRequestTarget target) { showResult(mainResult); - resetWorkItemCountModel(); - target.add(this); + resetWorkItemCountModel(); + target.add(this); } } diff --git a/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java b/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java index 2861ffe77fe..46a947b271f 100644 --- a/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java +++ b/repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java @@ -226,7 +226,7 @@ public class AuthorizationConstants { //Approvals (workflows) public static final String AUTZ_UI_APPROVALS_ALL_URL = NS_AUTHORIZATION_UI + "#approvalsAll"; public static final String AUTZ_UI_MY_WORK_ITEMS_URL = NS_AUTHORIZATION_UI + "#myWorkItems"; - public static final String AUTZ_UI_ATTORNEY_WORK_ITEMS_URL = NS_AUTHORIZATION_UI + "#myWorkItems"; + public static final String AUTZ_UI_ATTORNEY_WORK_ITEMS_URL = NS_AUTHORIZATION_UI + "#attorneyWorkItems"; public static final String AUTZ_UI_CLAIMABLE_WORK_ITEMS_URL = NS_AUTHORIZATION_UI + "#claimableWorkItems"; public static final String AUTZ_UI_ALL_WORK_ITEMS_URL = NS_AUTHORIZATION_UI + "#allWorkItems"; public static final String AUTZ_UI_WORK_ITEM_URL = NS_AUTHORIZATION_UI + "#workItem";