Fix MID-8571 resource oid/name conversion on My Accesses widget.

Evolveum · Mar 9, 2023 · 08fab73 · 08fab73
1 parent 1e00088
commit 08fab73
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 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
@@ -1191,8 +1191,6 @@ public static <O extends ObjectType> String getName(ObjectReferenceType ref, Pag
         String name = getName(ref);
         if (StringUtils.isEmpty(name) || name.equals(ref.getOid())) {
             String oid = ref.getOid();
-            Collection<SelectorOptions<GetOperationOptions>> options = SelectorOptions
-                    .createCollection(GetOperationOptions.createNoFetch());
             Class<O> type = (Class<O>) ObjectType.class;
             PrismObject<O> object = WebModelServiceUtils.loadObject(type, oid, pageBase,
                     pageBase.createSimpleTask(operation), new OperationResult(operation));

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
@@ -42,10 +42,12 @@
 public class AssignmentsUtil {
 
     public enum AssignmentTypeType {
-        CONSTRUCTION, ABSTRACT_ROLE, POLICY_RULE, FOCUS_MAPPING, PERSONA_CONSTRUCTION, ASSIGNMENT_RELATION;
+        CONSTRUCTION, ABSTRACT_ROLE, POLICY_RULE, FOCUS_MAPPING, PERSONA_CONSTRUCTION, ASSIGNMENT_RELATION
     }
 
     private static final Trace LOGGER = TraceManager.getTrace(AssignmentsUtil.class);
+    private static final String DOT_CLASS = AssignmentsUtil.class.getSimpleName() + ".";
+    private static final String OPERATION_LOAD_USER = DOT_CLASS + "loadObject";
 
     public static AssignmentTypeType getAssignmentType(PrismContainerValueWrapper<AssignmentType> assignmentValueWrapper) {
         if (assignmentValueWrapper == null) {
@@ -168,7 +170,7 @@ private static IModel<String> createTimeIntervalStatusMessage(TimeIntervalStatus
     }
 
     public static IModel<Date> createDateModel(final IModel<XMLGregorianCalendar> model) {
-        return new Model<Date>() {
+        return new Model<>() {
 
             @Override
             public Date getObject() {
@@ -191,7 +193,7 @@ public void setObject(Date object) {
     }
 
     public static IModel<String> createAssignmentStatusClassModel(final UserDtoStatus model) {
-        return new IModel<String>() {
+        return new IModel<>() {
             private static final long serialVersionUID = 1L;
 
             @Override
@@ -202,7 +204,7 @@ public String getObject() {
     }
 
     public static IModel<String> createAssignmentIconTitleModel(BasePanel panel, AssignmentEditorDtoType type) {
-        return new IModel<String>() {
+        return new IModel<>() {
             private static final long serialVersionUID = 1L;
 
             @Override
@@ -276,7 +278,7 @@ public static String getName(AssignmentType assignment, PageBase pageBase) {
             // account assignment through account construction
             ConstructionType construction = assignment.getConstruction();
             if (construction.getResourceRef() != null) {
-                sb.append(WebComponentUtil.getName(construction.getResourceRef(), true));
+                sb.append(WebComponentUtil.getName(construction.getResourceRef(), pageBase, OPERATION_LOAD_USER));
             }
             return sb.toString();
         }