adding show result MID-4983

Evolveum · Mar 5, 2019 · a23ebb9 · a23ebb9
1 parent 69d728d
commit a23ebb9
Showing 1 changed file with 16 additions and 9 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
@@ -624,18 +624,15 @@ public static TaskType createSingleRecurrenceTask(String taskName, QName applica
 		return task;
 	}
 
-	public static void executeBulkAction(PageBase pageBase, ScriptingExpressionType script, Task task, OperationResult result ){
-		try {
+	public static void executeBulkAction(PageBase pageBase, ScriptingExpressionType script, Task task, OperationResult result ) 
+			throws SchemaException, SecurityViolationException, ObjectNotFoundException, ExpressionEvaluationException, 
+			CommunicationException, ConfigurationException{
+
 		pageBase.getScriptingService().evaluateExpressionInBackground(script, task, result);
-	} catch (SchemaException | SecurityViolationException | ExpressionEvaluationException | ObjectNotFoundException | CommunicationException | ConfigurationException e) {
-    	result.recordFatalError(pageBase.createStringResource("WebComponentUtil.message.startPerformed.fatalError.submit").getString(), e);
-        LoggingUtils.logUnexpectedException(LOGGER, "Couldn't submit bulk action to execution", e);
-    }
 	}
 
 	public static void executeMemberOperation(Task operationalTask, QName type, ObjectQuery memberQuery,
 			ScriptingExpressionType script, OperationResult parentResult, PageBase pageBase) throws SchemaException {
-		TaskType taskType = new TaskType(pageBase.getPrismContext());
 
 		MidPointPrincipal owner = SecurityUtils.getPrincipalUser();
 		operationalTask.setOwner(owner.getUser().asPrismObject());
@@ -647,8 +644,18 @@ public static void executeMemberOperation(Task operationalTask, QName type, Obje
 		schedule.setMisfireAction(MisfireActionType.EXECUTE_IMMEDIATELY);
 		operationalTask.makeSingle(schedule);
 		operationalTask.setName(WebComponentUtil.createPolyFromOrigString(parentResult.getOperation()));
-
-		executeBulkAction(pageBase, script, operationalTask, parentResult);
+
+		try {
+			executeBulkAction(pageBase, script, operationalTask, parentResult);
+			parentResult.recordInProgress();
+			parentResult.setBackgroundTaskOid(operationalTask.getOid());
+			pageBase.showResult(parentResult);
+		} catch (ObjectNotFoundException | SchemaException
+			| ExpressionEvaluationException | CommunicationException | ConfigurationException
+			| SecurityViolationException e) {
+			parentResult.recordFatalError(pageBase.createStringResource("WebComponentUtil.message.startPerformed.fatalError.submit").getString(), e);
+	        LoggingUtils.logUnexpectedException(LOGGER, "Couldn't submit bulk action to execution", e);
+		}
 	}
 
 	public static void executeMemberOperation(Task operationalTask, QName type, ObjectQuery memberQuery,