MID-4841 add kind/intent information to assignment table

Evolveum · Aug 31, 2018 · abf0a0b · abf0a0b
1 parent ec9bfb3
commit abf0a0b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java b/...main/java/com/evolveum/midpoint/web/component/assignment/AbstractRoleAssignmentPanel.java
@@ -241,10 +241,16 @@ protected void addSelectedAssignmentsPerformed(AjaxRequestTarget target, List<As
     protected List<IColumn<ContainerValueWrapper<AssignmentType>, String>> initColumns() {
         List<IColumn<ContainerValueWrapper<AssignmentType>, String>> columns = new ArrayList<>();
 
-        columns.add(new AbstractColumn<ContainerValueWrapper<AssignmentType>, String>(createStringResource("ObjectReferenceType.relation")) {
+        columns.add(new AbstractColumn<ContainerValueWrapper<AssignmentType>, String>(
+                createStringResource("AbstractRoleAssignmentPanel.relationKindIntentColumn")) {
             @Override
             public void populateItem(Item<ICellPopulator<ContainerValueWrapper<AssignmentType>>> item, String componentId, IModel<ContainerValueWrapper<AssignmentType>> assignmentModel) {
-                item.add(new Label(componentId, getRelationLabelValue(assignmentModel.getObject())));
+                AssignmentType assignment = assignmentModel.getObject().getContainerValue().asContainerable();
+                if (assignment.getConstruction() != null){
+                    item.add(new Label(componentId, getKindIntentLabelValue(assignment.getConstruction())));
+                } else {
+                    item.add(new Label(componentId, getRelationLabelValue(assignmentModel.getObject())));
+                }
             }
         });
 
@@ -289,6 +295,19 @@ private String getRelationLabelValue(ContainerValueWrapper<AssignmentType> assig
         return assignmentWrapper.getContainerValue().getValue().getTargetRef().getRelation().getLocalPart();
     }
 
+    private String getKindIntentLabelValue(ConstructionType constructionType){
+        if (constructionType == null){
+            return "";
+        }
+        StringBuilder sb = new StringBuilder();
+        sb.append(constructionType.getKind() != null && !StringUtils.isEmpty(constructionType.getKind().value()) ?
+                constructionType.getKind().value() : createStringResource("AssignmentEditorPanel.undefined").getString());
+        sb.append("/");
+        sb.append(!StringUtils.isEmpty(constructionType.getIntent()) ? constructionType.getIntent()
+                : createStringResource("AssignmentEditorPanel.undefined").getString());
+        return sb.toString();
+    }
+
     protected boolean showAllAssignmentsVisible(){
         return true;
     }

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -4092,6 +4092,7 @@ AssociationDetailsPanel.AssociationHeader=Association
 RoleRelationSelectionPanel.select.relation=Select relations to process
 operation.com.evolveum.midpoint.web.page.admin.workflow.PageWorkItem.delegateWorkItem=Delegate work item
 AbstractRoleAssignmentPanel.relationLabel=Relation
+AbstractRoleAssignmentPanel.relationKindIntentColumn=Relation or Kind/Intent
 AbstractRoleAssignmentPanel.identifierLabel=Identifier
 AbstractRoleMainPanel.inducedEntitlements=Induced entitlements
 AbstractObjectMainPanel.editXmlButton=Edit raw