From 18c2764248fb9e271a39d9419eba8c346fe38c12 Mon Sep 17 00:00:00 2001
From: honchar <honchar@evolveum.com>
Date: Mon, 29 May 2017 15:18:25 +0200
Subject: [PATCH] added target user selection button to assignments list page
 (shopping cart)

---
 .../assignment/AssignmentCatalogPanel.html    |   7 +-
 .../assignment/AssignmentCatalogPanel.java    | 154 ++------------
 .../assignment/CatalogItemsPanel.java         |   9 -
 .../TargetUserSelectorComponent.html          |  25 +++
 .../TargetUserSelectorComponent.java          | 191 ++++++++++++++++++
 .../web/component/data/MultiButtonTable.java  |  40 ----
 .../web/page/self/PageAssignmentsList.html    |   5 +-
 .../web/page/self/PageAssignmentsList.java    |   7 +
 8 files changed, 241 insertions(+), 197 deletions(-)
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.html
 create mode 100644 gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.java

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
index 036879ade8a..ac90aefed91 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
@@ -24,12 +24,7 @@
             <select class="form-control input-sm col-md-2" wicket:id="viewTypeSelect"/>
         </div>
 
-        <div class="col-md-2" wicket:id="targetUserContainer">
-            <a wicket:id="targetUserButton" class="btn btn-sm btn-default">
-                <span wicket:id="targetUserLabel"/>
-                <i wicket:id="deleteTargetUserButton" class="fa fa-times-circle fa-lg text-danger" style="margin-left: 10px;"/>
-            </a>
-        </div>
+        <div class="col-md-2" wicket:id="targetUserPanel" />
 
         <form class="col-md-7 search-form" wicket:id="searchForm">
             <div wicket:id="search"/>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
index ae268614105..4debd8f8577 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.java
@@ -40,22 +40,18 @@
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.orgs.OrgTreePanel;
-import com.evolveum.midpoint.web.page.admin.users.component.AbstractRoleMemberPanel;
 import com.evolveum.midpoint.web.page.admin.users.dto.UserDtoStatus;
 import com.evolveum.midpoint.web.page.self.PageAssignmentsList;
 import com.evolveum.midpoint.web.page.self.dto.AssignmentViewType;
-import com.evolveum.midpoint.web.security.SecurityUtils;
 import com.evolveum.midpoint.web.session.OrgTreeStateStorage;
 import com.evolveum.midpoint.web.session.RoleCatalogStorage;
 import com.evolveum.midpoint.web.session.SessionStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import com.sun.tools.xjc.reader.xmlschema.bindinfo.BIConversion;
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.ajax.AjaxChannel;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -86,18 +82,13 @@ public class AssignmentCatalogPanel<F extends AbstractRoleType> extends BasePane
     private static final String ID_VIEW_TYPE = "viewTypeSelect";
     private static final String ID_SEARCH_FORM = "searchForm";
     private static final String ID_SEARCH = "search";
-    private static final String ID_PANEL_CONTAINER = "catalogItemsPanelContainer";
-    private static final String ID_TARGET_USER_CONTAINER = "targetUserContainer";
-    private static final String ID_TARGET_USER_BUTTON = "targetUserButton";
-    private static final String ID_DELETE_TARGET_USER_BUTTON = "deleteTargetUserButton";
-    private static final String ID_TARGET_USER_LABEL = "targetUserLabel";
+    private static final String ID_TARGET_USER_PANEL = "targetUserPanel";
 
     private static final String DOT_CLASS = AssignmentCatalogPanel.class.getName();
     private static final Trace LOGGER = TraceManager.getTrace(AssignmentCatalogPanel.class);
     private static final String OPERATION_LOAD_ASSIGNMENT_CONSTRAINTS = DOT_CLASS + "loadAssignmentConstraints";
     private static final String OPERATION_LOAD_ASSIGNABLE_ROLES = DOT_CLASS + "loadAssignableRoles";
 
-    private static final int TARGET_USERS_TITLE_ROWS = 30;
     private PageBase pageBase;
     private IModel<String> selectedTreeItemOidModel;
     private String rootOid;
@@ -105,7 +96,6 @@ public class AssignmentCatalogPanel<F extends AbstractRoleType> extends BasePane
     private IModel<AssignmentViewType> viewModel;
     private ObjectDataProvider<AssignmentEditorDto, AbstractRoleType> objectProvider;
     private int itemsPerRow = 4;
-    private boolean showUserSelectionPopup = true;
     private List<AssignmentEditorDto> listProviderData;
     List<AssignmentViewType> viewTypeList = new ArrayList<>();
 
@@ -330,46 +320,11 @@ public Search load() {
     }
 
     private void initUserSelectionPanel(WebMarkupContainer headerPanel){
-        WebMarkupContainer targetUserContainer = new WebMarkupContainer(ID_TARGET_USER_CONTAINER);
-        targetUserContainer.setOutputMarkupId(true);
-        AjaxLink<String> targetUserButton = new AjaxLink<String>(ID_TARGET_USER_BUTTON) {
-            private static final long serialVersionUID = 1L;
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                if (showUserSelectionPopup) {
-                    initUserSelectionPopup(createStringResource("AssignmentCatalogPanel.selectTargetUser"), true, target);
-                }
-                showUserSelectionPopup = true;
-            }
-        };
-        targetUserButton.setOutputMarkupId(true);
-        targetUserButton.add(new AttributeAppender("title", getTargetUsersButtonTitle()));
-        targetUserContainer.add(targetUserButton);
-
-        Label label = new Label(ID_TARGET_USER_LABEL, getTargetUserLabelModel());
-        label.setRenderBodyOnly(true);
-        targetUserButton.add(label);
-
-        AjaxLink deleteButton = new AjaxLink(ID_DELETE_TARGET_USER_BUTTON) {
-            private static final long serialVersionUID = 1L;
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                showUserSelectionPopup = false;
-                getRoleCatalogStorage().setTargetUserList(null);
-                target.add(getTargetUserContainer());
-            }
-        };
-        deleteButton.add(new VisibleEnableBehaviour(){
-            private static final long serialVersionUID = 1L;
-            @Override
-            public boolean isVisible(){
-                return  getRoleCatalogStorage().getTargetUserList() != null &&
-                        getRoleCatalogStorage().getTargetUserList().size() > 0;
-            }
-        });
-        targetUserButton.add(deleteButton);
-        headerPanel.add(targetUserContainer);
+        WebMarkupContainer targetUserPanel = new TargetUserSelectorComponent(ID_TARGET_USER_PANEL, "btn-sm", pageBase);
+        targetUserPanel.setOutputMarkupId(true);
+        headerPanel.add(targetUserPanel);
     }
+
     private void initViewSelector(WebMarkupContainer headerPanel){
         DropDownChoice<AssignmentViewType> viewSelect = new DropDownChoice(ID_VIEW_TYPE, viewModel,
                 Model.ofList(viewTypeList != null && viewTypeList.size() > 0 ?
@@ -381,8 +336,8 @@ private void initViewSelector(WebMarkupContainer headerPanel){
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
                 if (AssignmentViewType.USER_TYPE.equals(viewSelect.getModelObject())){
-                    initUserSelectionPopup(createStringResource("AssignmentCatalogPanel.selectAssignmentsUserOwner"),
-                            false, target);
+                    initUserViewSelectionPopup(createStringResource("AssignmentCatalogPanel.selectAssignmentsUserOwner"),
+                            target);
                 } else {
                     AssignmentCatalogPanel.this.addOrReplaceLayout(target, getCatalogItemsPanelContainer());
                     target.add(getCatalogItemsPanelContainer());
@@ -395,40 +350,7 @@ protected void onUpdate(AjaxRequestTarget target) {
 
     }
 
-    private IModel<String> getTargetUsersButtonTitle() {
-        return new LoadableModel<String>(true) {
-            public String load() {
-                StringBuilder sb = new StringBuilder();
-                if (getRoleCatalogStorage().isMultiUserRequest()) {
-                    List<PrismObject<UserType>> sortedList = getRoleCatalogStorage().getTargetUserList();
-                    Collections.sort(sortedList, new Comparator<PrismObject<UserType>>() {
-
-                        @Override
-                        public int compare(PrismObject<UserType> u1, PrismObject<UserType> u2) {
-                            return String.CASE_INSENSITIVE_ORDER.compare(u1.getName().getOrig(), u2.getName().getOrig());
-                        }
-                    });
-                    int columnsAmount = sortedList.size() / TARGET_USERS_TITLE_ROWS;
-                    Iterator<PrismObject<UserType>> it = sortedList.iterator();
-                    while (it.hasNext()){
-                        for (int i=0; i <= columnsAmount; i++){
-                            if (it.hasNext()){
-                                PrismObject user = it.next();
-                                sb.append(user.getName().getOrig());
-                                if (it.hasNext()){
-                                    sb.append(",\t");
-                                }
-                            }
-                        }
-                        sb.append(System.lineSeparator());
-                    }
-                }
-                return sb.toString();
-            }
-        };
-    }
-
-    private WebMarkupContainer getCatalogItemsPanelContainer(){
+   private WebMarkupContainer getCatalogItemsPanelContainer(){
         return (WebMarkupContainer)get(ID_CATALOG_ITEMS_PANEL_CONTAINER);
     }
 
@@ -621,25 +543,15 @@ private boolean isCatalogOidEmpty(){
                 (selectedTreeItemOidModel == null || StringUtils.isEmpty(oid));
     }
 
-    private void initUserSelectionPopup(StringResourceModel title, boolean multiselect, AjaxRequestTarget target) {
+    private void initUserViewSelectionPopup(StringResourceModel title, AjaxRequestTarget target) {
 
         List<QName> supportedTypes = new ArrayList<>();
         supportedTypes.add(pageBase.getPrismContext().getSchemaRegistry()
                 .findObjectDefinitionByCompileTimeClass(UserType.class).getTypeName());
         ObjectBrowserPanel<UserType> focusBrowser = new ObjectBrowserPanel<UserType>(pageBase.getMainPopupBodyId(),
-                UserType.class, supportedTypes, multiselect, pageBase, null, getSelectedObjects()) {
-            @Override
-            protected void addPerformed(AjaxRequestTarget target, QName type, List<UserType> selected) {
-                super.addPerformed(target, type, selected);
-                List<PrismObject<UserType>> userList = new ArrayList<>();
-                for (UserType user : selected){
-                    userList.add(user.asPrismObject());
-                }
-                getRoleCatalogStorage().setTargetUserList(userList);
-                AssignmentCatalogPanel.this.addOrReplaceLayout(target, getCatalogItemsPanelContainer());
-                target.add(getHeaderPanel());
-                target.add(getCatalogItemsPanelContainer());
-            }
+                UserType.class, supportedTypes, false, pageBase, null, new ArrayList<>()) {
+
+            private static final long serialVersionUID = 1L;
 
             @Override
             protected void onSelectPerformed(AjaxRequestTarget target, UserType targetUser) {
@@ -656,48 +568,8 @@ public StringResourceModel getTitle() {
                 return title;
             }
 
-         };
-        pageBase.showMainPopup(focusBrowser, target);
-    }
-
-    private List<UserType> getSelectedObjects(){
-        List<PrismObject<UserType>> selectedUsers = getRoleCatalogStorage().getTargetUserList();
-        List<UserType> users = new ArrayList<>();
-        if (selectedUsers != null) {
-            for (PrismObject<UserType> user : selectedUsers) {
-                users.add(user.asObjectable());
-            }
-        }
-        return users;
-    }
-
-    private WebMarkupContainer getTargetUserContainer(){
-        return (WebMarkupContainer)get(ID_HEADER_PANEL).get(ID_TARGET_USER_CONTAINER);
-    }
-    private IModel<String> getTargetUserLabelModel(){
-        return new IModel<String>() {
-            @Override
-            public String getObject() {
-                if (getRoleCatalogStorage().isSelfRequest()){
-                    return createStringResource("AssignmentCatalogPanel.requestForMe").getString();
-                }
-                List<PrismObject<UserType>> targetUsersList =  getRoleCatalogStorage().getTargetUserList();
-                if (targetUsersList.size() == 1){
-                    return createStringResource("AssignmentCatalogPanel.requestFor").getString() +
-                            " " + targetUsersList.get(0).getName().getOrig();
-                }
-                return createStringResource("AssignmentCatalogPanel.requestForMultiple", targetUsersList.size()).getString();
-            }
-
-            @Override
-            public void setObject(String s) {
-            }
-
-            @Override
-            public void detach() {
-
-            }
         };
+        pageBase.showMainPopup(focusBrowser, target);
     }
 
     private boolean isAlreadyAssigned(PrismObject<AbstractRoleType> obj, AssignmentEditorDto assignmentDto){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
index a962bde9c3b..0bcf21e9df5 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/CatalogItemsPanel.java
@@ -49,7 +49,6 @@ public class CatalogItemsPanel extends BasePanel implements IPageableItems {
     private static final String ID_PAGING = "paging";
     private static final String ID_COUNT = "count";
     private static final String ID_FOOTER_CONTAINER = "footerContainer";
-    private static final String ID_SUBMIT_BUTTON = "submitButton";
     private static final String ID_FOOTER = "footer";
 
     private ObjectDataProvider<AssignmentEditorDto, AbstractRoleType> objectDataProvider;
@@ -63,10 +62,6 @@ public class CatalogItemsPanel extends BasePanel implements IPageableItems {
     private long currentPage = 0;
     private boolean isListProvider = false;
 
-    public CatalogItemsPanel(String id) {
-        super(id);
-    }
-
     public CatalogItemsPanel(String id, final PageBase pageBase, int itemsPerRow,
                              ListDataProvider provider) {
         super(id);
@@ -115,10 +110,6 @@ private void initLayout() {
 
     }
 
-    protected void refreshCatalogItemsPanel() {
-
-    }
-
     private void initItemListModel() {
         List<AssignmentEditorDto> itemList = new ArrayList<>();
         if (isListProvider){
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.html
new file mode 100644
index 00000000000..b1e775ee448
--- /dev/null
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.html
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (c) 2016 Evolveum
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+        <a wicket:id="targetUserButton">
+            <span wicket:id="targetUserLabel"/>
+            <i wicket:id="deleteTargetUserButton" class="fa fa-times-circle fa-lg text-danger" style="margin-left: 10px;"/>
+        </a>
+</wicket:panel>
+</html>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.java
new file mode 100644
index 00000000000..20dfecbe27f
--- /dev/null
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/TargetUserSelectorComponent.java
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2016-2017 Evolveum
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.evolveum.midpoint.web.component.assignment;
+
+import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.gui.api.component.ObjectBrowserPanel;
+import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.session.RoleCatalogStorage;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.util.StringUtil;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.StringResourceModel;
+
+import javax.xml.namespace.QName;
+import java.util.*;
+
+/**
+ * Created by honchar.
+ */
+public class TargetUserSelectorComponent extends BasePanel {
+
+    private static final String ID_TARGET_USER_BUTTON = "targetUserButton";
+    private static final String ID_DELETE_TARGET_USER_BUTTON = "deleteTargetUserButton";
+    private static final String ID_TARGET_USER_LABEL = "targetUserLabel";
+    private static final int TARGET_USERS_TITLE_ROWS = 30;
+
+    private PageBase pageBase;
+    private boolean showUserSelectionPopup = true;
+    private String additionalButtonStyle;
+
+    public TargetUserSelectorComponent(String id, PageBase pageBase){
+        this(id, "", pageBase);
+    }
+
+    public TargetUserSelectorComponent(String id, String additionalButtonStyle, PageBase pageBase){
+        super(id);
+        this.additionalButtonStyle = additionalButtonStyle;
+        this.pageBase = pageBase;
+        initLayout();
+    }
+
+    private void initLayout(){
+        AjaxLink<String> targetUserButton = new AjaxLink<String>(ID_TARGET_USER_BUTTON) {
+            private static final long serialVersionUID = 1L;
+            @Override
+            public void onClick(AjaxRequestTarget target) {
+                if (showUserSelectionPopup) {
+                    initUserSelectionPopup(createStringResource("AssignmentCatalogPanel.selectTargetUser"), true, target);
+                }
+                showUserSelectionPopup = true;
+            }
+        };
+        targetUserButton.add(new AttributeAppender("class", "btn btn-default"
+                + (StringUtils.isEmpty(additionalButtonStyle) ? "" : " " + additionalButtonStyle)));
+
+        targetUserButton.setOutputMarkupId(true);
+        targetUserButton.add(new AttributeAppender("title", getTargetUsersButtonTitle()));
+        add(targetUserButton);
+
+        Label label = new Label(ID_TARGET_USER_LABEL, createStringResource("AssignmentCatalogPanel.selectTargetUser"));
+        label.setRenderBodyOnly(true);
+        targetUserButton.add(label);
+
+        AjaxLink deleteButton = new AjaxLink(ID_DELETE_TARGET_USER_BUTTON) {
+            private static final long serialVersionUID = 1L;
+            @Override
+            public void onClick(AjaxRequestTarget target) {
+                showUserSelectionPopup = false;
+                getRoleCatalogStorage().setTargetUserList(null);
+                target.add(pageBase);
+            }
+        };
+        deleteButton.add(new VisibleEnableBehaviour(){
+            private static final long serialVersionUID = 1L;
+            @Override
+            public boolean isVisible(){
+                return  getRoleCatalogStorage().getTargetUserList() != null &&
+                        getRoleCatalogStorage().getTargetUserList().size() > 0;
+            }
+        });
+        targetUserButton.add(deleteButton);
+    }
+
+    private void initUserSelectionPopup(StringResourceModel title, boolean multiselect, AjaxRequestTarget target) {
+
+        List<QName> supportedTypes = new ArrayList<>();
+        supportedTypes.add(pageBase.getPrismContext().getSchemaRegistry()
+                .findObjectDefinitionByCompileTimeClass(UserType.class).getTypeName());
+        ObjectBrowserPanel<UserType> focusBrowser = new ObjectBrowserPanel<UserType>(pageBase.getMainPopupBodyId(),
+                UserType.class, supportedTypes, multiselect, pageBase, null, getSelectedObjects()) {
+            @Override
+            protected void addPerformed(AjaxRequestTarget target, QName type, List<UserType> selected) {
+                super.addPerformed(target, type, selected);
+                List<PrismObject<UserType>> userList = new ArrayList<>();
+                for (UserType user : selected){
+                    userList.add(user.asPrismObject());
+                }
+                getRoleCatalogStorage().setTargetUserList(userList);
+                target.add(pageBase);
+            }
+
+            @Override
+            public StringResourceModel getTitle() {
+                return title;
+            }
+
+        };
+        pageBase.showMainPopup(focusBrowser, target);
+    }
+
+    private List<UserType> getSelectedObjects(){
+        List<PrismObject<UserType>> selectedUsers = getRoleCatalogStorage().getTargetUserList();
+        List<UserType> users = new ArrayList<>();
+        if (selectedUsers != null) {
+            for (PrismObject<UserType> user : selectedUsers) {
+                users.add(user.asObjectable());
+            }
+        }
+        return users;
+    }
+
+    private IModel<String> getTargetUsersButtonTitle() {
+        return new LoadableModel<String>(true) {
+            public String load() {
+                if (getRoleCatalogStorage().isSelfRequest()){
+                    return createStringResource("AssignmentCatalogPanel.requestForMe").getString();
+                }
+                List<PrismObject<UserType>> targetUsersList =  getRoleCatalogStorage().getTargetUserList();
+                if (targetUsersList.size() == 1){
+                    return createStringResource("AssignmentCatalogPanel.requestFor").getString() +
+                            " " + targetUsersList.get(0).getName().getOrig();
+                }
+
+                StringBuilder sb = new StringBuilder( createStringResource("AssignmentCatalogPanel.requestForMultiple", targetUsersList.size()).getString());
+                sb.append(System.lineSeparator());
+                if (getRoleCatalogStorage().isMultiUserRequest()) {
+                    List<PrismObject<UserType>> sortedList = getRoleCatalogStorage().getTargetUserList();
+                    Collections.sort(sortedList, new Comparator<PrismObject<UserType>>() {
+
+                        @Override
+                        public int compare(PrismObject<UserType> u1, PrismObject<UserType> u2) {
+                            return String.CASE_INSENSITIVE_ORDER.compare(u1.getName().getOrig(), u2.getName().getOrig());
+                        }
+                    });
+                    int columnsAmount = sortedList.size() / TARGET_USERS_TITLE_ROWS;
+                    Iterator<PrismObject<UserType>> it = sortedList.iterator();
+                    while (it.hasNext()){
+                        for (int i=0; i <= columnsAmount; i++){
+                            if (it.hasNext()){
+                                PrismObject user = it.next();
+                                sb.append(user.getName().getOrig());
+                                if (it.hasNext()){
+                                    sb.append(",\t");
+                                }
+                            }
+                        }
+                        sb.append(System.lineSeparator());
+                    }
+                }
+                return sb.toString();
+            }
+        };
+    }
+
+    private RoleCatalogStorage getRoleCatalogStorage(){
+        return pageBase.getSessionStorage().getRoleCatalog();
+    }
+}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
index 5db362b7753..0d14eaec46b 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java
@@ -75,8 +75,6 @@ public class MultiButtonTable extends BasePanel<List<AssignmentEditorDto>> {
     private static final Trace LOGGER = TraceManager.getTrace(AssignmentCatalogPanel.class);
     private static final String OPERATION_LOAD_TARGET_OBJECT = DOT_CLASS + "." + "loadTargetObject";
 
-    private String addToCartLinkIcon = "fa fa-times-circle fa-lg text-danger";
-    private String detailsLinkIcon = "fa fa-arrow-circle-right";
     private long itemsCount = 0;
     private long itemsPerRow = 0;
     private PageBase pageBase;
@@ -316,44 +314,6 @@ private void addAssignmentPerformed(AssignmentEditorDto assignment, AjaxRequestT
 
     }
 
-    private PageBase getTargetObjectDetailsPage(AssignmentEditorDtoType type, PrismObject<AbstractRoleType> targetObject){
-        if (targetObject == null){
-            return pageBase;
-        }
-        if (AssignmentEditorDtoType.ORG_UNIT.equals(type)){
-            return new PageOrgUnit(((OrgType)targetObject.asObjectable()).asPrismObject()){
-                private static final long serialVersionUID = 1L;
-
-                @Override
-                protected IModel<String> createPageTitleModel() {
-                    return createStringResource("PageAdminObjectDetails.title.editOrgType",
-                            WebComponentUtil.getName(targetObject.asObjectable()));
-                }
-            };
-        } else if (AssignmentEditorDtoType.ROLE.equals(type)){
-            return new PageRole(((RoleType)targetObject.asObjectable()).asPrismObject()){
-                private static final long serialVersionUID = 1L;
-
-                @Override
-                protected IModel<String> createPageTitleModel() {
-                    return createStringResource("PageAdminObjectDetails.title.editRoleType",
-                            WebComponentUtil.getName(targetObject.asObjectable()));
-                }
-            };
-        } else if (AssignmentEditorDtoType.SERVICE.equals(type)){
-            return new PageService(((ServiceType)targetObject.asObjectable()).asPrismObject()){
-                private static final long serialVersionUID = 1L;
-
-                @Override
-                protected IModel<String> createPageTitleModel() {
-                    return createStringResource("PageAdminObjectDetails.title.editServiceType",
-                            WebComponentUtil.getName(targetObject.asObjectable()));
-                }
-            };
-        }
-        return pageBase;
-    }
-
     private boolean isMultiUserRequest(){
         return pageBase.getSessionStorage().getRoleCatalog().isMultiUserRequest();
     }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
index 7c7254a8c49..a7427d2be35 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
@@ -26,12 +26,15 @@ <h4><wicket:message key="PageAssignmentsList.requestComment" /></h4>
         <textarea class="form-control input-sm" rows="2"
                   wicket:id="description"
                   wicket:message="placeholder:PageAssignmentsList.commentHere" style="width: 50%; margin-bottom: 10px;"></textarea>
-        <div class="main-button-bar">
+        <div class="col-md-4">
+            <div wicket:id="targetUserPanel" class="pull-left"/>
+            <div class="main-button-bar">
             <span class="button-group">
                 <a class="btn btn-default" wicket:id="back"/>
             <a class="btn btn-danger" wicket:id="resolveConflicts"/>
             <a class="btn btn-primary" wicket:id="request"/>
             </span>
+            </div>
         </div>
     </form>
 </wicket:extend>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
index cb0ef8e069a..85d94cd901f 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
@@ -25,6 +25,7 @@
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
 import com.evolveum.midpoint.web.component.assignment.AssignmentEditorDto;
 import com.evolveum.midpoint.web.component.assignment.AssignmentTablePanel;
+import com.evolveum.midpoint.web.component.assignment.TargetUserSelectorComponent;
 import com.evolveum.midpoint.web.component.form.Form;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
@@ -37,6 +38,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -54,6 +56,7 @@ public class PageAssignmentsList<F extends FocusType> extends PageBase{
     private static final String ID_REQUEST_BUTTON = "request";
     private static final String ID_RESOLVE_CONFLICTS_BUTTON = "resolveConflicts";
     private static final String ID_DESCRIPTION = "description";
+    private static final String ID_TARGET_USER_PANEL = "targetUserPanel";
 
     private static final Trace LOGGER = TraceManager.getTrace(PageRequestRole.class);
     private static final String DOT_CLASS = PageAssignmentsList.class.getName() + ".";
@@ -103,6 +106,10 @@ public void onClick(AjaxRequestTarget target) {
         };
         mainForm.add(panel);
 
+        WebMarkupContainer targetUserPanel = new TargetUserSelectorComponent(ID_TARGET_USER_PANEL, PageAssignmentsList.this);
+        targetUserPanel.setOutputMarkupId(true);
+        mainForm.add(targetUserPanel);
+
         TextArea descriptionInput = new TextArea<String>(ID_DESCRIPTION, descriptionModel);
         descriptionInput.add(new AjaxFormComponentUpdatingBehavior("blur") {