Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Mar 14, 2023 · d6ef62e · d6ef62e
2 parents ef2595b + f717d13
commit d6ef62e
Show file tree

Hide file tree

Showing 38 changed files with 1,507 additions and 433 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBuilder.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchBuilder.java
@@ -191,6 +191,7 @@ private void initTimestampForAudit(Search<C> search) {
                 && !isViewForDashboard && !isPreview) {
             Date todayDate = Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant());
             timestampItem.setSingleDate(MiscUtil.asXMLGregorianCalendar(todayDate));
+            timestampItem.setInterval(true);
         }
     }
 

diff --git a/...a/com/evolveum/midpoint/gui/impl/component/search/panel/DateIntervalSearchPopupPanel.html b/...a/com/evolveum/midpoint/gui/impl/component/search/panel/DateIntervalSearchPopupPanel.html
@@ -10,23 +10,25 @@
 <head/>
 <body>
 <wicket:panel>
-    <form wicket:id="popoverForm">
-        <div class="d-flex">
+    <form wicket:id="popoverForm" style="min-width: 400px;">
+        <div class="row">
             <label class="col-form-label-sm col-2" wicket:id="fromLabel">
                 <wicket:message key="UserReportConfigPanel.dateFrom"/>
             </label>
             <div wicket:id="fromValueContainer">
                 <div wicket:id="dateFromValue" />
             </div>
         </div>
-        <div class="d-flex" wicket:id="toDateContainer">
+        <div class="row" wicket:id="toDateContainer">
             <label class="col-form-label-sm col-2">
                 <wicket:message key="UserReportConfigPanel.dateTo"/>
             </label>
             <div class="col-10" wicket:id="dateToValue"/>
         </div>
-        <div class="d-flex flex-row-reverse">
-            <a wicket:id="confirmButton" class="btn btn-sm btn-default"/>
+        <div class="row justify-content-end">
+            <div class="col-auto">
+                <a wicket:id="confirmButton" class="btn btn-sm btn-default"/>
+            </div>
         </div>
     </form>
 </wicket:panel>

diff --git a/...va/com/evolveum/midpoint/gui/impl/component/search/wrapper/ItemPathSearchItemWrapper.java b/...va/com/evolveum/midpoint/gui/impl/component/search/wrapper/ItemPathSearchItemWrapper.java
@@ -35,6 +35,9 @@ public DisplayableValue<ItemPathType> getDefaultValue() {
     @Override
     public ObjectFilter createFilter(Class type, PageBase pageBase, VariablesMap variables) {
         ItemPathType itemPath = getValue().getValue();
+        if (itemPath == null) {
+            return null;
+        }
         return PrismContext.get().queryFor(type)
                     .item(getPath()).eq(itemPath).buildFilter();
     }

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/mark/ShadowMarkPanel.html b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/mark/ShadowMarkPanel.html
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2021 Evolveum
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:wicket="http://wicket.apache.org">
+<body>
+    <wicket:panel>
+        <form class="clearfix form-horizontal" wicket:id="form">
+            <div wicket:id="memberContainer">
+                <div wicket:id="memberTable" />
+            </div>
+        </form>
+    </wicket:panel>
+</body>
+</html>
+