localization for assignments table and ValueChoosePanel

Evolveum · Dec 4, 2019 · 0decd21 · 0decd21
1 parent b21cf49
commit 0decd21
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -1128,15 +1128,20 @@ public static <O extends ObjectType> String getDisplayNameOrName(ObjectReference
         return name;
     }
 
-    public static <O extends ObjectType> String getEffectiveName(ObjectReferenceType ref, QName propertyName, PageBase pageBase, String operation) {
+    public static <O extends ObjectType> String getEffectiveName(ObjectReferenceType ref, QName propertyName,
+                                                                 PageBase pageBase, String operation) {
+        return getEffectiveName(ref, propertyName, pageBase, operation, false);
+    }
+    public static <O extends ObjectType> String getEffectiveName(ObjectReferenceType ref, QName propertyName,
+                                                                 PageBase pageBase, String operation, boolean translate) {
         PrismObject<O> object = WebModelServiceUtils.loadObject(ref, pageBase,
                 pageBase.createSimpleTask(operation), new OperationResult(operation));
 
         if (object == null) {
             return "Not Found";
         }
 
-        return getEffectiveName(object, propertyName);
+        return getEffectiveName(object, propertyName, translate);
 
     }
 

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java b/...min-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentsUtil.java
@@ -263,7 +263,7 @@ public static String getName(PrismContainerValueWrapper<AssignmentType> assignme
                 if (constraints != null && constraints.getExclusion() != null && constraints.getExclusion().size() > 0){
                     sb.append(pageBase.createStringResource("PolicyConstraintsType.exclusion").getString() + ": ");
                     constraints.getExclusion().forEach(exclusion -> {
-                        sb.append(WebComponentUtil.getName(exclusion.getTargetRef()));
+                        sb.append(WebComponentUtil.getName(exclusion.getTargetRef(), true));
                         sb.append("; ");
                     });
                 }
@@ -277,7 +277,7 @@ public static String getName(PrismContainerValueWrapper<AssignmentType> assignme
             // account assignment through account construction
             ConstructionType construction = assignment.getConstruction();
             if (construction.getResourceRef() != null) {
-                sb.append(WebComponentUtil.getName(construction.getResourceRef()));
+                sb.append(WebComponentUtil.getName(construction.getResourceRef(), true));
             }
             return sb.toString();
         }
@@ -299,7 +299,8 @@ public static String getName(PrismContainerValueWrapper<AssignmentType> assignme
         }
 
         if (isNotEmptyRef(assignment.getTargetRef())) {
-            sb.append(WebComponentUtil.getEffectiveName(assignment.getTargetRef(), OrgType.F_DISPLAY_NAME, pageBase, "loadTargetName"));
+            sb.append(WebComponentUtil.getEffectiveName(assignment.getTargetRef(), OrgType.F_DISPLAY_NAME, pageBase,
+                    "loadTargetName", true));
         }
 
 //        appendTenantAndOrgName(assignment, pageBase);

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
@@ -181,7 +181,9 @@ public String getObject() {
                 R prv = model.getObject();
 
                     return prv == null ? null
-                            : (prv.getTargetName() != null ? (prv.getTargetName().getOrig()
+                            : (prv.getTargetName() != null ?
+                            (getPageBase().getLocalizationService().translate(PolyString.toPolyString(prv.getTargetName()),
+                                    getPageBase().getLocale(), true)
                                     + (prv.getType() != null ? ": " + prv.getType().getLocalPart() : ""))
                                     : prv.getOid());
             }