Merge remote-tracking branch 'origin/master'

Evolveum · Sep 12, 2022 · cd3b4b1 · cd3b4b1
2 parents dfd7f16 + 2835163
commit cd3b4b1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/...mpl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java b/...mpl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java
@@ -169,7 +169,7 @@ protected String load() {
 
             @Override
             public boolean isEnabled(IModel<PrismContainerValueWrapper<AssignmentType>> rowModel) {
-                return rowModel.getObject().getRealValue().getFocusMappings() == null;
+                return rowModel.getObject().getRealValue().getFocusMappings() == null && !isDashboard();
             }
 
             @Override

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/PageSelfDashboard.html b/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/PageSelfDashboard.html
@@ -9,17 +9,19 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:extend>
-    <div class="quicksearch-panel d-flex justify-content-end" wicket:id="searchPanel"/>
-    <div class="d-flex flex-wrap">
-        <wicket:container wicket:id="statisticWidgetsPanel">
-            <span class="p-2 dashboard-link-component" wicket:id="statisticWidget"/>
-        </wicket:container>
-    </div>
-     <div class="d-flex flex-wrap">
-        <wicket:container wicket:id="objectCollectionViewWidgetsPanel">
-            <div wicket:id="objectCollectionViewWidget"></div>
-        </wicket:container>
-    </div>
+    <form wicket:id="mainForm">
+        <div class="quicksearch-panel d-flex justify-content-end" wicket:id="searchPanel"/>
+        <div class="d-flex flex-wrap">
+            <wicket:container wicket:id="statisticWidgetsPanel">
+                <span class="p-2 dashboard-link-component" wicket:id="statisticWidget"/>
+            </wicket:container>
+        </div>
+        <div class="d-flex flex-wrap">
+            <wicket:container wicket:id="objectCollectionViewWidgetsPanel">
+                <div wicket:id="objectCollectionViewWidget"></div>
+            </wicket:container>
+        </div>
+    </form>
 </wicket:extend>
 </body>
 </html>
diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/PageSelfDashboard.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/dashboard/PageSelfDashboard.java
@@ -22,10 +22,13 @@
 import com.evolveum.midpoint.security.api.SecurityUtil;
 import com.evolveum.midpoint.util.exception.SecurityViolationException;
 
+import com.evolveum.midpoint.web.component.form.MidpointForm;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.wicket.Component;
 import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.html.panel.Panel;
@@ -75,6 +78,9 @@ public PageSelfDashboard() {
     }
 
     private void initLayout() {
+        MidpointForm<?> mainForm = new MidpointForm<>("mainForm");
+        add(mainForm);
+
         DashboardSearchPanel dashboardSearchPanel = new DashboardSearchPanel(ID_SEARCH_PANEL);
         List<String> searchPanelActions = Arrays.asList(AuthorizationConstants.AUTZ_UI_USERS_ALL_URL,
                 AuthorizationConstants.AUTZ_UI_USERS_URL, AuthorizationConstants.AUTZ_UI_RESOURCES_ALL_URL,
@@ -84,14 +90,14 @@ private void initLayout() {
             UserInterfaceElementVisibilityType visibility = getComponentVisibility(PredefinedDashboardWidgetId.SEARCH);
             return WebComponentUtil.getElementVisibility(visibility, searchPanelActions);
         }));
-        add(dashboardSearchPanel);
+        mainForm.add(dashboardSearchPanel);
 
-        initStatisticWidgets();
+        initStatisticWidgets(mainForm);
 
-        initPreviewWidgets();
+        initPreviewWidgets(mainForm);
      }
 
-     private void initStatisticWidgets() {
+     private void initStatisticWidgets(Form mainForm) {
          ListView<ContainerPanelConfigurationType> linksPanel = new ListView<>(ID_STATISTIC_WIDGETS_PANEL, this::getStatisticWidgetList) {
 
              private static final long serialVersionUID = 1L;
@@ -108,10 +114,10 @@ protected void populateItem(ListItem<ContainerPanelConfigurationType> item) {
              UserInterfaceElementVisibilityType visibility = getComponentVisibility(PredefinedDashboardWidgetId.SHORTCUTS);
              return WebComponentUtil.getElementVisibility(visibility);
          }));
-         add(linksPanel);
+         mainForm.add(linksPanel);
      }
 
-     private void initPreviewWidgets() {
+     private void initPreviewWidgets(Form mainForm) {
          ListView<ContainerPanelConfigurationType> viewWidgetsPanel = new ListView<>(ID_OBJECT_COLLECTION_VIEW_WIDGETS_PANEL, this::getNonStatisticWidgetList) {
 
              @Override
@@ -127,7 +133,7 @@ protected void populateItem(ListItem<ContainerPanelConfigurationType> item) {
             UserInterfaceElementVisibilityType visibility = getComponentVisibility(PredefinedDashboardWidgetId.PREVIEW_WIDGETS);
             return getCompiledGuiProfile().getHomePage() != null && WebComponentUtil.getElementVisibility(visibility);
          }));
-         add(viewWidgetsPanel);
+         mainForm.add(viewWidgetsPanel);
      }
 
      private IModel<String> getWidgetCssClassModel(ContainerPanelConfigurationType panelConfig) {