small fixes in assignment editor panel, small cleanup in role member …

…panel, added missing messages..
Evolveum · Sep 28, 2015 · 4fbf14f · 4fbf14f
1 parent 63fa26e
commit 4fbf14f
Show file tree

Hide file tree

Showing 10 changed files with 830 additions and 1,061 deletions.
diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
@@ -25,6 +25,7 @@
 import com.evolveum.midpoint.prism.query.NotFilter;
 import com.evolveum.midpoint.prism.query.ObjectFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
+import com.evolveum.midpoint.prism.query.OrFilter;
 import com.evolveum.midpoint.schema.GetOperationOptions;
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -505,8 +506,9 @@ private WebMarkupContainer createOrgContainer(){
             protected ObjectQuery getChooseQuery(){
                 ObjectQuery query = new ObjectQuery();
 
-                ObjectFilter filter = NotFilter.createNot(EqualFilter.createEqual(OrgType.F_TENANT, OrgType.class,
-                        getPageBase().getPrismContext(), null, true));
+                ObjectFilter filter = OrFilter.createOr(
+                		EqualFilter.createEqual(OrgType.F_TENANT, OrgType.class, getPageBase().getPrismContext(), null, false),
+                		EqualFilter.createEqual(OrgType.F_TENANT, OrgType.class, getPageBase().getPrismContext(), null, null));
                 query.setFilter(filter);
 
                 return query;