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

Evolveum · Aug 20, 2018 · dc2bf50 · dc2bf50
2 parents 1aca85b + f1cefb1
commit dc2bf50
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
@@ -172,7 +172,7 @@ protected void onUpdate(AjaxRequestTarget target) {
 		form.add(seachScrope);
 
 		RelationDropDownChoicePanel relationSelector = new RelationDropDownChoicePanel(ID_SEARCH_BY_RELATION,
-				Model.of(), AreaCategoryType.ADMINISTRATION, true){
+				Model.of(), AreaCategoryType.ORGANIZATION, true){
 			private static final long serialVersionUID = 1L;
 
 			@Override

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/RelationTypes.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/RelationTypes.java
@@ -33,8 +33,8 @@ public enum RelationTypes {
     MANAGER(SchemaConstants.ORG_MANAGER, "Manager", AreaCategoryType.ADMINISTRATION, AreaCategoryType.GOVERNANCE, AreaCategoryType.ORGANIZATION, AreaCategoryType.SELF_SERVICE),
     META(SchemaConstants.ORG_META, "Meta", AreaCategoryType.POLICY),
     DEPUTY(SchemaConstants.ORG_DEPUTY, "Deputy" /* no values */),
-    APPROVER(SchemaConstants.ORG_APPROVER, "Approver", AreaCategoryType.ADMINISTRATION, AreaCategoryType.GOVERNANCE, AreaCategoryType.SELF_SERVICE),
-    OWNER(SchemaConstants.ORG_OWNER, "Owner", AreaCategoryType.ADMINISTRATION, AreaCategoryType.GOVERNANCE, AreaCategoryType.SELF_SERVICE),
+    APPROVER(SchemaConstants.ORG_APPROVER, "Approver", AreaCategoryType.ADMINISTRATION, AreaCategoryType.GOVERNANCE, AreaCategoryType.ORGANIZATION, AreaCategoryType.SELF_SERVICE),
+    OWNER(SchemaConstants.ORG_OWNER, "Owner", AreaCategoryType.ADMINISTRATION, AreaCategoryType.GOVERNANCE, AreaCategoryType.ORGANIZATION, AreaCategoryType.SELF_SERVICE),
     CONSENT(SchemaConstants.ORG_CONSENT, "Consent", AreaCategoryType.DATA_PROTECTION),;