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

Evolveum · Mar 14, 2022 · a50a1ed · a50a1ed
2 parents cb77868 + aad8570
commit a50a1ed
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 51 deletions.
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
@@ -61,8 +61,11 @@ public abstract class PageFocusDetails<F extends FocusType, FDM extends FocusDet
     private static final String ID_PROGRESS_PANEL = "progressPanel";
 
     private boolean saveOnConfigure;
+
     protected boolean previewRequested;
 
+    private Boolean readonlyOverride;
+
     public PageFocusDetails() {
         super();
     }
@@ -90,6 +93,10 @@ protected void onTimer(AjaxRequestTarget target) {
         }
     }
 
+    public void setReadonlyOverride(Boolean readonlyOverride) {
+        this.readonlyOverride = readonlyOverride;
+    }
+
     public void setSaveOnConfigure(boolean saveOnConfigure) {
         this.saveOnConfigure = saveOnConfigure;
     }
@@ -203,9 +210,14 @@ protected ObjectChangeExecutor getChangeExecutor() {
 
     @Override
     protected FDM createObjectDetailsModels(PrismObject<F> object) {
-        return (FDM) new FocusDetailsModels<>(createPrismObjectModel(object), this);
-    }
+        return (FDM) new FocusDetailsModels<>(createPrismObjectModel(object), this) {
 
+            @Override
+            protected boolean isReadonly() {
+                return readonlyOverride != null ? readonlyOverride : super.isReadonly();
+            }
+        };
+    }
 
     @Override
     public ProgressPanel startAndGetProgressPanel(AjaxRequestTarget target, OperationResult result) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRole.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/role/PageRole.java
@@ -23,7 +23,7 @@
 
 @PageDescriptor(
         urls = {
-                @Url(mountUrl = "/admin/roleNew")
+                @Url(mountUrl = "/admin/roleNew", matchUrlForSecurity = "/admin/roleNew")
         },
         encoder = OnePageParameterEncoder.class, action = {
         @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_ROLES_ALL_URL, label = "PageAdminRoles.auth.roleAll.label", description = "PageAdminRoles.auth.roleAll.description"),

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageService.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageService.java
@@ -24,7 +24,7 @@
 
 @PageDescriptor(
         urls = {
-                @Url(mountUrl = "/admin/serviceNew")
+                @Url(mountUrl = "/admin/serviceNew", matchUrlForSecurity = "/admin/serviceNew")
         },
         encoder = OnePageParameterEncoder.class, action = {
         @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_SERVICES_ALL_URL,

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUser.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/PageUser.java
@@ -53,7 +53,7 @@
 
 @PageDescriptor(
         urls = {
-                @Url(mountUrl = "/admin/userNew")
+                @Url(mountUrl = "/admin/userNew", matchUrlForSecurity = "/admin/userNew")
         },
         encoder = OnePageParameterEncoder.class,
         action = {

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java b/...i/src/main/java/com/evolveum/midpoint/web/component/assignment/RoleCatalogItemButton.java
@@ -11,7 +11,7 @@
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
-import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.FocusDetailsModels;
+import com.evolveum.midpoint.gui.impl.page.admin.focus.PageFocusDetails;
 import com.evolveum.midpoint.gui.impl.page.admin.org.PageOrg;
 import com.evolveum.midpoint.gui.impl.page.admin.role.PageRole;
 import com.evolveum.midpoint.gui.impl.page.admin.service.PageService;
@@ -300,69 +300,32 @@ private void targetObjectDetailsPerformed(AssignmentEditorDto assignment, AjaxRe
             OperationResult result = new OperationResult(OPERATION_LOAD_OBJECT);
             Task task = getPageBase().createSimpleTask(OPERATION_LOAD_OBJECT);
 
-//            PageParameters parameters = new PageParameters();
-//            parameters.add(OnePageParameterEncoder.PARAMETER, assignment.getTargetRef().getOid());
-
             if (AssignmentEditorDtoType.ORG_UNIT.equals(assignment.getType())){
                 PrismObject<OrgType> object = WebModelServiceUtils.loadObject(OrgType.class, assignment.getTargetRef().getOid(),
                         getPageBase(), task, result);
-                getPageBase().navigateToNext(new PageOrg(object) {
-                    private static final long serialVersionUID = 1L;
-
-                    @Override
-                    protected FocusDetailsModels<OrgType> createObjectDetailsModels(PrismObject<OrgType> object) {
-                        return new FocusDetailsModels<OrgType>(createPrismObjectModel(object), this) {
-                            private static final long serialVersionUID = 1L;
 
-                            @Override
-                            protected boolean isReadonly() {
-                                return true;
-                            }
-                        };
-                    }
-                });
+                navigateToDetails(new PageOrg(object));
             } else if (AssignmentEditorDtoType.ROLE.equals(assignment.getType())){
                 PrismObject<RoleType> object = WebModelServiceUtils.loadObject(RoleType.class, assignment.getTargetRef().getOid(),
                         getPageBase(), task, result);
-                getPageBase().navigateToNext(new PageRole(object)  {
-                    private static final long serialVersionUID = 1L;
-
-                    @Override
-                    protected FocusDetailsModels<RoleType> createObjectDetailsModels(PrismObject<RoleType> object) {
-                        return new FocusDetailsModels<RoleType>(createPrismObjectModel(object), this) {
-                            private static final long serialVersionUID = 1L;
 
-                            @Override
-                            protected boolean isReadonly() {
-                                return true;
-                            }
-                        };
-                    }
-                });
+                navigateToDetails(new PageRole(object));
             } else if (AssignmentEditorDtoType.SERVICE.equals(assignment.getType())){
                 PrismObject<ServiceType> object = WebModelServiceUtils.loadObject(ServiceType.class, assignment.getTargetRef().getOid(),
                         getPageBase(), task, result);
-                getPageBase().navigateToNext(new PageService(object)  {
-                    private static final long serialVersionUID = 1L;
-
-                    @Override
-                    protected FocusDetailsModels<ServiceType> createObjectDetailsModels(PrismObject<ServiceType> object) {
-                        return new FocusDetailsModels<ServiceType>(createPrismObjectModel(object), this) {
-                            private static final long serialVersionUID = 1L;
 
-                            @Override
-                            protected boolean isReadonly() {
-                                return true;
-                            }
-                        };
-                    }
-                });
+                navigateToDetails(new PageService(object));
             }
         } else {
             plusIconClicked = false;
         }
     }
 
+    private void navigateToDetails(PageFocusDetails next) {
+        next.setReadonlyOverride(true);
+        getPageBase().navigateToNext(next);
+    }
+
     private boolean isMultiUserRequest(){
         return getRoleCatalogStorage().isMultiUserRequest();
     }