page title fix (MID-4984)

Evolveum · Mar 2, 2020 · df26e92 · df26e92
1 parent 2c8cafd
commit df26e92
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
@@ -27,6 +27,7 @@
 import com.evolveum.midpoint.web.component.prism.ValueStatus;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
+import com.evolveum.midpoint.web.page.admin.configuration.PageSystemConfiguration;
 import com.evolveum.midpoint.web.page.admin.server.OperationalButtonsPanel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
@@ -149,6 +150,9 @@ protected void onTimer(AjaxRequestTarget target) {
 
     @Override
     protected IModel<String> createPageTitleModel() {
+        if (PageAdminObjectDetails.this instanceof PageSystemConfiguration){
+            return super.createPageTitleModel();
+        }
         String simpleName = getObjectSimpleName();
         String lokalizedSimpleName = new StringResourceModel("ObjectType." + simpleName).setDefaultValue(simpleName).getString();
         if (isAdd()) {

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
@@ -161,7 +161,7 @@ protected IModel<String> createPageTitleModel() {
             @Override
             protected String load() {
                 if (editedResourceOid == null) {
-                    return PageResourceWizard.super.createPageTitleModel().getObject();
+                    return createStringResource("PageResourceWizard.title").getString();
                 }
                 String name = WebComponentUtil.getName(modelRaw.getObject());
                 return createStringResource("PageResourceWizard.title.edit", name).getString();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageOrgSelfProfile.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageOrgSelfProfile.java
@@ -10,6 +10,7 @@
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
 
+import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
@@ -61,6 +62,11 @@ protected boolean isSelfProfile(){
         return true;
     }
 
+    @Override
+    protected IModel<String> createPageTitleModel() {
+        return createStringResource("PageAdmin.menu.profile");
+    }
+
     @Override
     protected void createBreadcrumb() {
         super.createBreadcrumb();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRoleSelfProfile.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRoleSelfProfile.java
@@ -12,6 +12,7 @@
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
 
+import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
@@ -65,6 +66,11 @@ protected boolean isSelfProfile(){
         return true;
     }
 
+    @Override
+    protected IModel<String> createPageTitleModel() {
+        return createStringResource("PageAdmin.menu.profile");
+    }
+
     @Override
     protected void createBreadcrumb() {
         super.createBreadcrumb();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageServiceSelfProfile.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageServiceSelfProfile.java
@@ -10,6 +10,7 @@
 
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType;
 
+import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
@@ -63,6 +64,11 @@ protected boolean isSelfProfile(){
         return true;
     }
 
+    @Override
+    protected IModel<String> createPageTitleModel() {
+        return createStringResource("PageAdmin.menu.profile");
+    }
+
     @Override
     protected void createBreadcrumb() {
         super.createBreadcrumb();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageUserSelfProfile.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageUserSelfProfile.java
@@ -8,6 +8,7 @@
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 
+import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
@@ -65,6 +66,11 @@ protected String getObjectOidParameter() {
     }
 
 
+    @Override
+    protected IModel<String> createPageTitleModel() {
+        return createStringResource("PageAdmin.menu.profile");
+    }
+
     @Override
     protected boolean isSelfProfile(){
         return true;