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 9c9750b2c9c..ae29bc807fa 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 @@ -31,11 +31,13 @@ import com.evolveum.midpoint.web.component.util.LoadableModel; import com.evolveum.midpoint.web.component.util.PrismPropertyModel; import com.evolveum.midpoint.web.page.admin.configuration.PageAdminConfiguration; +import com.evolveum.midpoint.web.util.Base64Model; import com.evolveum.midpoint.web.util.OnePageParameterEncoder; import com.evolveum.midpoint.web.util.WebMiscUtil; import com.evolveum.midpoint.web.util.WebModelUtils; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType; + import org.apache.wicket.RestartResponseException; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.form.Form; @@ -114,12 +116,12 @@ private void initLayout() { createStringResource("ObjectType.description"), ID_LABEL_SIZE, ID_INPUT_SIZE, false); mainForm.add(description); - AceEditor templateEditor = new AceEditor(ID_TEMPLATE_EDITOR, - new PrismPropertyModel<>(model, ReportType.F_TEMPLATE)); + AceEditor templateEditor = new AceEditor(ID_TEMPLATE_EDITOR, new Base64Model( + new PrismPropertyModel<>(model, ReportType.F_TEMPLATE))); mainForm.add(templateEditor); - AceEditor templateStyleEditor = new AceEditor(ID_TEMPLATE_STYLE_EDITOR, - new PrismPropertyModel<>(model, ReportType.F_TEMPLATE_STYLE)); + AceEditor templateStyleEditor = new AceEditor(ID_TEMPLATE_STYLE_EDITOR, new Base64Model( + new PrismPropertyModel<>(model, ReportType.F_TEMPLATE_STYLE))); mainForm.add(templateStyleEditor); // List tabs = new ArrayList(); diff --git a/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml b/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml index 133e7b8a301..ea9893641da 100644 --- a/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml +++ b/gui/admin-gui/src/main/resources/initial-objects/090-report-audit.xml @@ -17,7 +17,7 @@ xmlns:c="http://midpoint.evolveum.com/xml/ns/public/common/common-3" xmlns:t="http://prism.evolveum.com/xml/ns/public/types-3" xmlns:xsd="http://www.w3.org/2001/XMLSchema" - oid="AUDITLOG-3333-3333-TEST-10000000000" + oid="00000000-0000-0000-0000-000000000009" version="0"> Audit logs report @@ -26,258 +26,8 @@ Report made from audit records. true - - - - - - - - -