basic tab fix for cases + some configuration

Evolveum · Sep 27, 2021 · 57e3d42 · 57e3d42
1 parent 25c296f
commit 57e3d42
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 26 deletions.
diff --git a/config/initial-objects/024-archetype-operation-request.xml b/config/initial-objects/024-archetype-operation-request.xml
@@ -48,19 +48,10 @@
                             <cssClass>fa fa-circle-o</cssClass>
                         </icon>
                     </display>
+                    <displayOrder>1</displayOrder>
                     <panelType>operationRequestCase</panelType>
                     <type>c:CaseType</type>
-                </panel>
-                <panel>
-                    <identifier>operationRequestCase</identifier>
-                    <display>
-                        <label>Operation request</label>
-                        <icon>
-                            <cssClass>fa fa-circle-o</cssClass>
-                        </icon>
-                    </display>
-                    <panelType>operationRequestCase</panelType>
-                    <type>c:CaseType</type>
+                    <default>true</default>
                 </panel>
             </objectDetails>
         </adminGuiConfiguration>

diff --git a/config/initial-objects/025-archetype-approval-case.xml b/config/initial-objects/025-archetype-approval-case.xml
@@ -48,8 +48,10 @@
                             <cssClass>fa fa-circle-o</cssClass>
                         </icon>
                     </display>
+                    <displayOrder>1</displayOrder>
                     <panelType>approvalCase</panelType>
                     <type>c:CaseType</type>
+                    <default>true</default>
                 </panel>
             </objectDetails>
         </adminGuiConfiguration>

diff --git a/...m/midpoint/gui/impl/page/admin/assignmentholder/component/AssignmentHolderBasicPanel.java b/...m/midpoint/gui/impl/page/admin/assignmentholder/component/AssignmentHolderBasicPanel.java
@@ -12,25 +12,21 @@
 import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.application.PanelDisplay;
 import com.evolveum.midpoint.web.application.PanelInstance;
-import com.evolveum.midpoint.web.application.PanelInstances;
 import com.evolveum.midpoint.web.application.PanelType;
-import com.evolveum.midpoint.web.application.PanelDisplay;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentHolderType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
 
 @PanelType(name = "basic", defaultContainerPath = "empty")
-@PanelInstances(instances = {
-        @PanelInstance(identifier = "basic",
-                applicableForType = AssignmentHolderType.class,
-                excludeTypes = {TaskType.class, ResourceType.class},
-                defaultPanel = true,
-                display = @PanelDisplay(label = "pageAdminFocus.basic", icon = GuiStyleConstants.CLASS_CIRCLE_FULL, order = 10)),
-        @PanelInstance(identifier = "basic",
-                applicableForType = CaseType.class,
-                defaultPanel = true,
-                display = @PanelDisplay(label = "pageAdminFocus.basic", icon = GuiStyleConstants.CLASS_CIRCLE_FULL, order = 30))
-}
-)
+@PanelInstance(identifier = "basic",
+        applicableForType = AssignmentHolderType.class,
+        excludeTypes = { TaskType.class, ResourceType.class },
+        defaultPanel = true,
+        display = @PanelDisplay(label = "pageAdminFocus.basic", icon = GuiStyleConstants.CLASS_CIRCLE_FULL, order = 10))
+
 public class AssignmentHolderBasicPanel<AH extends AssignmentHolderType> extends AbstractObjectMainPanel<AH, ObjectDetailsModels<AH>> {
 
     private static final String ID_MAIN_PANEL = "properties";

diff --git a/gui/admin-gui/src/main/resources/initial-objects/024-archetype-operation-request.xml b/gui/admin-gui/src/main/resources/initial-objects/024-archetype-operation-request.xml
@@ -40,6 +40,19 @@
                     <panelType>childCases</panelType>
                     <type>c:CaseType</type>
                 </panel>
+                <panel>
+                    <identifier>operationRequestCase</identifier>
+                    <display>
+                        <label>Operation request</label>
+                        <icon>
+                            <cssClass>fa fa-circle-o</cssClass>
+                        </icon>
+                    </display>
+                    <displayOrder>1</displayOrder>
+                    <panelType>operationRequestCase</panelType>
+                    <type>c:CaseType</type>
+                    <default>true</default>
+                </panel>
             </objectDetails>
         </adminGuiConfiguration>
     </archetypePolicy>

diff --git a/gui/admin-gui/src/main/resources/initial-objects/025-archetype-approval-case.xml b/gui/admin-gui/src/main/resources/initial-objects/025-archetype-approval-case.xml
@@ -48,8 +48,10 @@
                             <cssClass>fa fa-circle-o</cssClass>
                         </icon>
                     </display>
+                    <displayOrder>1</displayOrder>
                     <panelType>approvalCase</panelType>
                     <type>c:CaseType</type>
+                    <default>true</default>
                 </panel>
             </objectDetails>
         </adminGuiConfiguration>