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

Evolveum · Nov 9, 2020 · 4c0d277 · 4c0d277
2 parents 929ebe5 + c277e76
commit 4c0d277
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 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
@@ -1517,13 +1517,23 @@ public static String getDisplayName(PrismObject object, boolean translate, Local
     }
 
     public static PolyStringType createPolyFromOrigString(String str) {
+        return createPolyFromOrigString(str, null);
+    }
+
+    public static PolyStringType createPolyFromOrigString(String str, String key) {
         if (str == null) {
             return null;
         }
 
         PolyStringType poly = new PolyStringType();
         poly.setOrig(str);
 
+        if (StringUtils.isNotEmpty(key)){
+            PolyStringTranslationType translation = new PolyStringTranslationType();
+            translation.setKey(key);
+            poly.setTranslation(translation);
+        }
+
         return poly;
     }
 

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java
@@ -129,7 +129,7 @@ public static void recomputeMembersPerformed(
 
     public static Task createRecomputeMembersTask(PageBase pageBase, QueryScope scope,
             ObjectQuery query, AjaxRequestTarget target) {
-        Task operationalTask = pageBase.createSimpleTask(getTaskName(RECOMPUTE_OPERATION, scope));
+        Task operationalTask = pageBase.createSimpleTask(getTaskName("Recompute", scope));
         OperationResult parentResult = operationalTask.getResult();
         return createRecomputeMemberOperationTask(operationalTask, AssignmentHolderType.COMPLEX_TYPE, query,
                 null, parentResult, pageBase, target);
@@ -297,7 +297,8 @@ public static <O extends ObjectType> Set<String> getFocusOidToRecompute(List<O>
     }
 
     private static String getTaskName(String operation, QueryScope scope) {
-        StringBuilder nameBuilder = new StringBuilder(operation);
+        StringBuilder nameBuilder = new StringBuilder("operation.");
+        nameBuilder.append(operation);
         nameBuilder.append(".");
         if (scope != null) {
             nameBuilder.append(scope.name());
@@ -382,7 +383,9 @@ private static void createTask(Task operationalTask, QName type, ObjectQuery mem
         ScheduleType schedule = new ScheduleType();
         schedule.setMisfireAction(MisfireActionType.EXECUTE_IMMEDIATELY);
         operationalTask.makeSingle(schedule);
-        operationalTask.setName(WebComponentUtil.createPolyFromOrigString(pageBase.createStringResource(parentResult.getOperation()).getString()));
+        String key = parentResult.getOperation();
+        String name = pageBase.createStringResource(key).getString();
+        operationalTask.setName(WebComponentUtil.createPolyFromOrigString(name, key));
 
         QueryType queryType = pageBase.getQueryConverter().createQueryType(memberQuery);
         operationalTask.setExtensionPropertyValue(SchemaConstants.MODEL_EXTENSION_OBJECT_QUERY, queryType);

diff --git a/testing/schrodingertest/pom.xml b/testing/schrodingertest/pom.xml
@@ -46,10 +46,6 @@
             <artifactId>schrodinger</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.codeborne</groupId>
             <artifactId>selenide</artifactId>
@@ -59,7 +55,6 @@
             <artifactId>slf4j-api</artifactId>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>