Merge branch 'master' of https://github.com/Evolveum/midpoint

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/AbstractPopupTabPanel.java

@@ -60,20 +60,20 @@ protected void onInitialize() {
         add(parametersPanelFragment);
     }
 
-    protected Component initObjectListPanel() {
-        PopupObjectListPanel<O> listPanel = new PopupObjectListPanel<O>(ID_OBJECT_LIST_PANEL,
-                (Class) getObjectType().getClassDefinition(), true, getPageBase()) {
+    protected Component initObjectListPanel(){
+        PopupObjectListPanel<O> listPanel = new PopupObjectListPanel<O>(ID_OBJECT_LIST_PANEL, (Class)getObjectType().getClassDefinition(),
+                true) {
 
             private static final long serialVersionUID = 1L;
 
             @Override
-            protected List<IColumn<SelectableBean<O>, String>> createColumns() {
-                if (AbstractRoleType.class.isAssignableFrom(getType())) {
+            protected List<IColumn<SelectableBean<O>, String>> createDefaultColumns() {
+                if (AbstractRoleType.class.isAssignableFrom(getType())){
                     List<IColumn<SelectableBean<O>, String>> columns = new ArrayList<>();
-                    columns.addAll((Collection) ColumnUtils.getDefaultAbstractRoleColumns(false));
+                    columns.addAll((Collection)ColumnUtils.getDefaultAbstractRoleColumns(false));
                     return columns;
                 } else {
-                    return super.createColumns();
+                    return super.createDefaultColumns();
                 }
             }
 
@@ -93,10 +93,10 @@ protected IModel<Boolean> getCheckBoxEnableModel(IModel<SelectableBean<O>> rowMo
             }
 
             @Override
-            protected ObjectQuery addFilterToContentQuery(ObjectQuery query) {
-                ObjectQuery queryWithFilters = AbstractPopupTabPanel.this.addFilterToContentQuery(query);
-                if (queryWithFilters == null) {
-                    queryWithFilters = AbstractPopupTabPanel.this.getPageBase().getPrismContext().queryFactory().createQuery();
+            protected ObjectQuery getCustomizeContentQuery() {
+                ObjectQuery customQuery = AbstractPopupTabPanel.this.addFilterToContentQuery();
+                if (customQuery == null) {
+                    customQuery = AbstractPopupTabPanel.this.getPageBase().getPrismContext().queryFactory().createQuery();
                 }
                 List<ObjectReferenceType> archetypeRefList = getArchetypeRefList();
                 if (!CollectionUtils.isEmpty(archetypeRefList)) {
@@ -113,15 +113,15 @@ protected ObjectQuery addFilterToContentQuery(ObjectQuery query) {
                     if (!CollectionUtils.isEmpty(archetypeRefFilterList)) {
                         OrFilter archetypeRefOrFilter =
                                 AbstractPopupTabPanel.this.getPageBase().getPrismContext().queryFactory().createOr(archetypeRefFilterList);
-                        queryWithFilters.addFilter(archetypeRefOrFilter);
+                        customQuery.addFilter(archetypeRefOrFilter);
                     }
                 }
 
                 ObjectFilter subTypeFilter = getSubtypeFilter();
                 if (subTypeFilter != null) {
-                    queryWithFilters.addFilter(subTypeFilter);
+                    customQuery.addFilter(subTypeFilter);
                 }
-                return queryWithFilters;
+                return customQuery;
             }
 
         };
@@ -147,7 +147,7 @@ protected List<O> getSelectedObjectsList() {
         if (objectListPanel == null) {
             return new ArrayList<>();
         }
-        return objectListPanel.getSelectedObjects();
+        return objectListPanel.getSelectedRealObjects();
     }
 
     protected PopupObjectListPanel getObjectListPanel() {
@@ -161,8 +161,8 @@ protected IModel<Boolean> getObjectSelectCheckBoxEnableModel(IModel<SelectableBe
         return Model.of(true);
     }
 
-    protected ObjectQuery addFilterToContentQuery(ObjectQuery query) {
-        return query;
+    protected ObjectQuery addFilterToContentQuery() {
+        return null;
     }
 
     protected List<ObjectReferenceType> getArchetypeRefList() {

gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/FocusTypeAssignmentPopupTabPanel.java

@@ -108,18 +108,14 @@ private RelationDropDownChoicePanel getRelationDropDown() {
     }
 
     @Override
-    protected ObjectQuery addFilterToContentQuery(ObjectQuery query) {
+    protected ObjectQuery addFilterToContentQuery() {
         LOGGER.debug("Loading roles which the current user has right to assign");
         Task task = getPageBase().createSimpleTask(OPERATION_LOAD_ASSIGNABLE_ROLES);
         OperationResult result = task.getResult();
 
         ObjectFilter filter = WebComponentUtil.getAssignableRolesFilter(getTargetedAssignemntObject(), (Class<AbstractRoleType>) getObjectType().getClassDefinition(),
                 isInducement() ? WebComponentUtil.AssignmentOrder.INDUCEMENT : WebComponentUtil.AssignmentOrder.ASSIGNMENT, result, task, getPageBase());
-        if (query == null) {
-            query = getPrismContext().queryFactory().createQuery();
-        }
-        query.addFilter(filter);
-        return query;
+        return getPrismContext().queryFactory().createQuery(filter);
     }
 
     protected boolean isInducement() {