From 52879dd38d74670767a47c543dda0a276d9dabf2 Mon Sep 17 00:00:00 2001
From: lskublik <lskublik@evolveum.com>
Date: Thu, 18 Jun 2020 13:53:10 +0200
Subject: [PATCH] fix for 'Save and Run' of reports

---
 .../midpoint/web/page/admin/reports/PageReport.java       | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
index ac3b91244f6..50865863179 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java
@@ -125,7 +125,13 @@ public void finishProcessing(AjaxRequestTarget target, Collection<ObjectDeltaOpe
             showResult(result);
             Task task = createSimpleTask("run_task");
             try {
-                PrismObject<ReportType> report = (PrismObject<ReportType>) executedDeltas.iterator().next().getObjectDelta().getObjectToAdd();
+
+                PrismObject<ReportType> report;
+                if (getObjectModel().getObject().getOid() != null) {
+                    report = getObjectModel().getObject().getObject();
+                } else {
+                    report = (PrismObject<ReportType>) executedDeltas.iterator().next().getObjectDelta().getObjectToAdd();
+                }
                 getReportManager().runReport(report, null, task, result);
             } catch (Exception ex) {
                 result.recordFatalError(ex);