From 9400e64aa86ac1017625aa0d3ea7e6d6ba172268 Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Tue, 10 Oct 2017 15:18:41 +0200
Subject: [PATCH] Small fixes for shopping kart.

---
 .../midpoint/web/page/self/PageAssignmentShoppingKart.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
index f832f70c40b..287290d8803 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java
@@ -120,7 +120,7 @@ protected void onInitialize() {
             initShoppingCartConfigurationDto();
             getRoleCatalogStorage().setShoppingCartConfigurationDto(shoppingCartConfigurationDto);
         }
-        if (StringUtils.isEmpty(getRoleCatalogStorage().getSelectedOid())){
+        if (StringUtils.isEmpty(getRoleCatalogStorage().getSelectedOid()) && shoppingCartConfigurationDto != null) {
             getRoleCatalogStorage().setSelectedOid(shoppingCartConfigurationDto.getRoleCatalogOid());
         }
         initModels();
@@ -372,11 +372,6 @@ public List<UserType> getObject() {
                 }, false, createStringResource("AssignmentCatalogPanel.selectSourceUser")){
             private static final long serialVersionUID = 1L;
 
-            @Override
-            protected ObjectFilter getUserQueryFilter(){
-                return getAssignableRolesFilter();
-            }
-
             @Override
             protected void singleUserSelectionPerformed(AjaxRequestTarget target, UserType user){
                 super.singleUserSelectionPerformed(target, user);