Small fixes for shopping kart.

Evolveum · Oct 10, 2017 · 9400e64 · 9400e64
1 parent 3dd23b7
commit 9400e64
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentShoppingKart.java b/...min-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);