execute options for details panel (MID-7257)

Evolveum · Sep 29, 2021 · b9c26f3 · b9c26f3
1 parent 71a14c9
commit b9c26f3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 26 deletions.
diff --git a/...n/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/FocusDetailsModels.java b/...n/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/FocusDetailsModels.java
@@ -10,6 +10,8 @@
 import java.util.Collection;
 import java.util.List;
 
+import com.evolveum.midpoint.web.page.admin.users.component.ExecuteChangeOptionsDto;
+
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.gui.api.factory.wrapper.PrismObjectWrapperFactory;
@@ -45,6 +47,7 @@ public class FocusDetailsModels<F extends FocusType> extends AssignmentHolderDet
     private static final String OPERATION_LOAD_SHADOW = DOT_CLASS + "loadShadow";
 
     private LoadableModel<List<ShadowWrapper>> projectionModel;
+    private final LoadableModel<ExecuteChangeOptionsDto> executeOptionsModel;
 
     public FocusDetailsModels(LoadableModel<PrismObject<F>> prismObjectModel, PageBase serviceLocator) {
         super(prismObjectModel, serviceLocator);
@@ -57,6 +60,15 @@ protected List<ShadowWrapper> load() {
                 return loadShadowWrappers();
             }
         };
+
+        executeOptionsModel = new LoadableModel<>(false) {
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            protected ExecuteChangeOptionsDto load() {
+                return ExecuteChangeOptionsDto.createFromSystemConfiguration();
+            }
+        };
     }
 
     private PageBase getPageBase() {
@@ -384,4 +396,8 @@ protected List<ObjectDelta<? extends ObjectType>> getAdditionalModifyDeltas(Oper
 
         return deltas;
     }
+
+    public LoadableModel<ExecuteChangeOptionsDto> getExecuteOptionsModel() {
+        return executeOptionsModel;
+    }
 }
diff --git a/...n/java/com/evolveum/midpoint/gui/impl/page/admin/component/ExecuteChangeOptionsPanel.java b/...n/java/com/evolveum/midpoint/gui/impl/page/admin/component/ExecuteChangeOptionsPanel.java
@@ -58,19 +58,8 @@ public class ExecuteChangeOptionsPanel extends BasePanel<ExecuteChangeOptionsDto
     private static final String ID_OPTIONS = "options";
     private static final String ID_RESET_CHOICES = "resetChoices";
 
-    private final LoadableModel<ExecuteChangeOptionsDto> executeOptionsModel;
-
-    public ExecuteChangeOptionsPanel(String id) {
-        super(id);
-
-         executeOptionsModel = new LoadableModel<>(false) {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            protected ExecuteChangeOptionsDto load() {
-                return ExecuteChangeOptionsDto.createFromSystemConfiguration();
-            }
-        };
+    public ExecuteChangeOptionsPanel(String id, LoadableModel<ExecuteChangeOptionsDto> executeOptionsModel) {
+        super(id, executeOptionsModel);
     }
 
     @Override
@@ -79,16 +68,6 @@ protected void onInitialize(){
         initLayout();
     }
 
-    @Override
-    public IModel<ExecuteChangeOptionsDto> getModel() {
-        return executeOptionsModel;
-    }
-
-    @Override
-    public ExecuteChangeOptionsDto getModelObject() {
-        return executeOptionsModel.getObject();
-    }
-
     private CheckboxMenuItem createCheckboxMenuItem(String label, String propertyExpression) {
         return new CheckboxMenuItem(createStringResource(label), new PropertyModel<>(getModel(), propertyExpression));
     }

diff --git a/...ava/com/evolveum/midpoint/gui/impl/page/admin/component/FocusOperationalButtonsPanel.java b/...ava/com/evolveum/midpoint/gui/impl/page/admin/component/FocusOperationalButtonsPanel.java
@@ -32,8 +32,11 @@ public class FocusOperationalButtonsPanel<F extends FocusType> extends Assignmen
 
     private static final String ID_EXECUTE_OPTIONS = "executeOptions";
 
-    public FocusOperationalButtonsPanel(String id, LoadableModel<PrismObjectWrapper<F>> model) {
+    private final LoadableModel<ExecuteChangeOptionsDto> executeOptionsModel;
+
+    public FocusOperationalButtonsPanel(String id, LoadableModel<PrismObjectWrapper<F>> model, LoadableModel<ExecuteChangeOptionsDto> executeOptionsModel) {
         super(id, model);
+        this.executeOptionsModel = executeOptionsModel;
     }
 
     @Override
@@ -43,7 +46,7 @@ protected void onInitialize() {
     }
 
     private void initLayout() {
-        ExecuteChangeOptionsPanel optionsPanel = new ExecuteChangeOptionsPanel(ID_EXECUTE_OPTIONS) {
+        ExecuteChangeOptionsPanel optionsPanel = new ExecuteChangeOptionsPanel(ID_EXECUTE_OPTIONS, executeOptionsModel) {
 
             @Override
             protected void reloadPanelOnOptionsUpdate(AjaxRequestTarget target) {

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusDetails.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusDetails.java
@@ -91,7 +91,7 @@ public void setSaveOnConfigure(boolean saveOnConfigure) {
 
     @Override
     protected FocusOperationalButtonsPanel<F> createButtonsPanel(String id, LoadableModel<PrismObjectWrapper<F>> wrapperModel) {
-        return new FocusOperationalButtonsPanel<>(id, wrapperModel) {
+        return new FocusOperationalButtonsPanel<>(id, wrapperModel, getObjectDetailsModels().getExecuteOptionsModel()) {
 
             @Override
             protected void savePerformed(AjaxRequestTarget target) {