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

Evolveum · May 24, 2023 · 1088735 · 1088735
2 parents ca63e0c + d1a1602
commit 1088735
Show file tree

Hide file tree

Showing 64 changed files with 3,286 additions and 1,037 deletions.
diff --git a/config/initial-objects/archetype/507-archetype-task-report.xml b/config/initial-objects/archetype/507-archetype-task-report.xml
@@ -32,10 +32,6 @@
             <path>extension/rext:reportParam</path>
             <visibility>visible</visibility>
         </itemConstraint>
-        <itemConstraint>
-            <path>extension/rext:reportOutputOid</path>
-            <visibility>visible</visibility>
-        </itemConstraint>
         <itemConstraint>
             <path>extension/rext:reportDataParam</path>
             <visibility>visible</visibility>
@@ -53,9 +49,6 @@
                         <item>
                             <c:path>extension/rext:reportParam</c:path>
                         </item>
-                        <item>
-                            <c:path>extension/rext:reportOutputOid</c:path>
-                        </item>
                         <item>
                             <c:path>extension/rext:reportDataParam</c:path>
                         </item>

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java b/...ui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
@@ -14,8 +14,6 @@
 import java.util.List;
 import java.util.Locale;
 
-import com.evolveum.midpoint.gui.api.page.PageAdminLTE;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
@@ -37,7 +35,7 @@
 import com.evolveum.midpoint.common.LocalizationService;
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
-import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.page.PageAdminLTE;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
@@ -189,9 +187,7 @@ public void onClick(AjaxRequestTarget target) {
 
             @Override
             public void onClick(AjaxRequestTarget target) {
-                if(this.getParent() != null){
-                    target.add(this.getParent().setVisible(false));
-                }
+                close(target, true);
             }
         };
         box.add(close);
@@ -217,9 +213,15 @@ public File getObject() {
         box.add(downloadXml);
     }
 
-    public void close(AjaxRequestTarget target) {
-        this.setVisible(false);
-        target.add(this);
+    public void close(AjaxRequestTarget target, boolean parent) {
+        if (parent) {
+            if (this.getParent() != null) {
+                target.add(this.getParent().setVisible(false));
+            }
+        } else {
+            this.setVisible(false);
+            target.add(this);
+        }
     }
 
     private WebMarkupContainer createMessage() {

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/api/util/HistoryPageTabVisibleBehavior.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/api/util/HistoryPageTabVisibleBehavior.java
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ObjectTabVisibleBehavior.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/ObjectTabVisibleBehavior.java
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
@@ -3417,7 +3417,7 @@ public static List<InlineMenuItem> createMenuItemsFromActions(@NotNull List<GuiA
                 return;
             }
             String label = action.getDisplay() != null && PolyStringUtils.isNotEmpty(action.getDisplay().getLabel()) ?
-                    action.getDisplay().getLabel().getOrig() : action.getName();
+                    action.getDisplay().getLabel().getOrig() : action.getIdentifier();
             menuItems.add(new InlineMenuItem(Model.of(label)) {
                 private static final long serialVersionUID = 1L;
 

diff --git a/...java/com/evolveum/midpoint/gui/impl/page/admin/component/TaskOperationalButtonsPanel.java b/...java/com/evolveum/midpoint/gui/impl/page/admin/component/TaskOperationalButtonsPanel.java
@@ -483,11 +483,6 @@ private String getReportDataOid() {
         if (reportData != null && reportData.getRealValue() != null && reportData.getRealValue().getOid() != null) {
             return reportData.getRealValue().getOid();
         }
-        PrismProperty<String> reportOutputOid = task.findProperty(
-                ItemPath.create(TaskType.F_EXTENSION, ReportConstants.REPORT_OUTPUT_OID_PROPERTY_NAME));
-        if (reportOutputOid != null) {
-            return reportOutputOid.getRealValue();
-        }
         return getReportDataOidFromImportActivity(task.asObjectable());
     }