fix for exporting popup on AuditLogViewerPanel

Evolveum · Jun 2, 2020 · 7d2a95b · 7d2a95b
1 parent aed7aad
commit 7d2a95b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java b/.../src/main/java/com/evolveum/midpoint/gui/api/component/button/CsvDownloadButtonPanel.java
@@ -163,6 +163,11 @@ public void exportPerformed(AjaxRequestTarget target) {
                     protected void createReportPerformed(String name, SearchFilterType filter, AjaxRequestTarget target) {
                         CsvDownloadButtonPanel.this.createReportPerformed(name, filter, exportableColumnsIndex, target);
                     }
+
+                    @Override
+                    public boolean isVisibleCreateReportOption() {
+                        return CsvDownloadButtonPanel.this.isVisibleCreateReportOption();
+                    }
                 };
                 getPageBase().showMainPopup(exportingPanel, target);
             }
@@ -185,4 +190,8 @@ protected void createReportPerformed(String name, SearchFilterType filter, AjaxR
 
     protected abstract void createReportPerformed(String name, SearchFilterType filter, List<Integer> indexOfColumns, AjaxRequestTarget target);
 
+    public boolean isVisibleCreateReportOption() {
+        return true;
+    }
+
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ExportingPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ExportingPanel.java
@@ -21,6 +21,7 @@
 import com.evolveum.midpoint.web.component.message.FeedbackAlerts;
 import com.evolveum.midpoint.web.component.search.Search;
 
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.prism.xml.ns._public.query_3.SearchFilterType;
 
 import org.apache.wicket.Component;
@@ -165,6 +166,12 @@ public void onClick(AjaxRequestTarget target) {
                 ((PageBase) getPage()).hideMainPopup(target);
             }
         };
+        createReport.add(new VisibleEnableBehaviour() {
+            @Override
+            public boolean isVisible() {
+                return isVisibleCreateReportOption();
+            }
+        });
         panel.add(createReport);
         AjaxButton exportSelected = new AjaxButton(ID_EXPORT,
                 new StringResourceModel("ExportingPopupPanel.exportSelected", this, null)) {
@@ -218,6 +225,8 @@ public WebMarkupContainer createPanel(String panelId) {
                 return createTable(panelId, dataTable);
             }
         });
+
+
         tabs.add(new PanelTab(getPageBase().createStringResource("ExportingPopupPanel.filter")) {
             @Override
             public WebMarkupContainer createPanel(String panelId) {
@@ -228,6 +237,11 @@ public PageBase getPageBase() {
                     }
                 };
             }
+
+            @Override
+            public boolean isVisible() {
+                return isVisibleCreateReportOption();
+            }
         });
         return tabs;
     }
@@ -364,4 +378,8 @@ public Component getComponent() {
         return this;
     }
 
+    public boolean isVisibleCreateReportOption() {
+        return true;
+    }
+
 }
diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html b/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.html
@@ -60,7 +60,7 @@
                             <label><wicket:message key="PageAuditLogViewer.changedItem" /></label>
                             <i class="helpTextIcon" wicket:id="changedItemFieldHelp"/>
                         </div>
-                        <div class="col-sm-9" wicket:id="changedItem"/>
+                        <div class="col-sm-9" style="padding-left: 30px;" wicket:id="changedItem"/>
                     </div>
                 </div>
                 <div class="col-md-6 form-horizontal">

diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java b/...main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
@@ -616,6 +616,11 @@ protected void createReportPerformed(String name, SearchFilterType filter, List<
                     protected DataTable<?, ?> getDataTable() {
                         return getAuditLogViewerTable().getDataTable();
                     }
+
+                    @Override
+                    public boolean isVisibleCreateReportOption() {
+                        return false;
+                    }
                 };
 
                 return exportDataLink;
@@ -659,7 +664,8 @@ protected List<IColumn<AuditEventRecordType, String>> initColumns() {
         List<IColumn<AuditEventRecordType, String>> columns = new ArrayList<>();
         IColumn<AuditEventRecordType, String> linkColumn = new LinkColumn<AuditEventRecordType>(
                 createStringResource("AuditEventRecordType.timestamp"), AuditEventRecordProvider.TIMESTAMP_VALUE_PARAMETER,
-                AuditEventRecordProvider.TIMESTAMP_VALUE_PARAMETER) {
+                AuditEventRecordType.F_TIMESTAMP.getLocalPart()) {
+
             private static final long serialVersionUID = 1L;
 
             @Override