MID-6557 dashboard label fix

Evolveum · May 19, 2022 · 5942ef4 · 5942ef4
1 parent dd17c3a
commit 5942ef4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -2068,8 +2068,10 @@ private MainMenuItem createHomeItems() {
                 DashboardType dashboard = prismObject.getRealValue();
                 Validate.notNull(dashboard, "Dashboard object is null");
 
-                StringResourceModel label = createStringResourceDefault(WebComponentUtil.getTranslatedPolyString(dashboard.getName()),
-                        WebComponentUtil.getCollectionLabel(dashboard.getDisplay(), null, dashboard));
+                String dashboardNameKey = WebComponentUtil.getTranslatedPolyString(dashboard.getName());
+                PolyStringType dashboardDisplayKey = WebComponentUtil.getCollectionLabel(dashboard.getDisplay(), null, dashboard);
+                StringResourceModel label = StringUtils.isNotEmpty(dashboardNameKey) && dashboardDisplayKey != null ?
+                        createStringResourceDefault(dashboardNameKey, dashboardDisplayKey) : createStringResource("PageAdmin.menu.dashboard");
                 PageParameters pageParameters = new PageParameters();
                 pageParameters.add(OnePageParameterEncoder.PARAMETER, dashboard.getOid());
                 MenuItem menu = new MenuItem(label, "", PageDashboardConfigurable.class, pageParameters, null, null);