fix for bad tooltips on member panel (MID-7322)

Evolveum · Oct 11, 2021 · 66ec950 · 66ec950
1 parent 0c61fe4
commit 66ec950
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 25 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -300,34 +300,15 @@ private DisplayType getNewObjectButtonStandardDisplayType() {
             }
          }
 
-        String sb = createStringResource("MainObjectListPanel.newObject").getString()
-                + " "
-                + createStringResource("ObjectTypeLowercase." + getType().getSimpleName()).getString();
+        String title = getTitleForNewObjectButton();
         return GuiDisplayTypeUtil.createDisplayType(GuiStyleConstants.CLASS_ADD_NEW_OBJECT, "green",
-                sb);
-    }
-
-    protected Map<IconCssStyle, IconType> createMainButtonLayerIcons(DisplayType mainButtonDisplayType) {
-        if (!isCollectionViewPanelForCompiledView()) {
-            return Collections.emptyMap();
-        }
-        return WebComponentUtil.createMainButtonLayerIcon(mainButtonDisplayType);
+                title);
     }
 
-    private DisplayType getNewObjectButtonSpecialDisplayType() {
-        String iconCssStyle = WebComponentUtil.createDefaultBlackIcon(WebComponentUtil.classToQName(getPageBase().getPrismContext(), getType()));
-
-        String sb = createStringResource("MainObjectListPanel.newObject").getString()
+    protected String getTitleForNewObjectButton() {
+        return createStringResource("MainObjectListPanel.newObject").getString()
                 + " "
                 + createStringResource("ObjectTypeLowercase." + getType().getSimpleName()).getString();
-        DisplayType display = GuiDisplayTypeUtil.createDisplayType(iconCssStyle, "", sb);
-        display.setLabel(WebComponentUtil.createPolyFromOrigString(
-                getType().getSimpleName(), "ObjectType." + getType().getSimpleName()));
-        return display;
-    }
-
-    protected boolean getNewObjectGenericButtonVisibility() {
-        return true;
     }
 
     private AjaxIconButton createImportObjectButton(String buttonId) {

diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
@@ -291,6 +291,11 @@ protected LoadableModel<MultiFunctinalButtonDto> loadButtonDescriptions() {
             public ContainerPanelConfigurationType getPanelConfiguration() {
                 return AbstractRoleMemberPanel.this.getPanelConfiguration();
             }
+
+            @Override
+            protected String getTitleForNewObjectButton() {
+                return createStringResource("TreeTablePanel.menu.createMember").getString();
+            }
         };
         childrenListPanel.setOutputMarkupId(true);
         memberContainer.add(childrenListPanel);
@@ -572,7 +577,7 @@ private List<ObjectReferenceType> archetypeReferencesListForType(QName type) {
 
     private AjaxIconButton createAssignButton(String buttonId) {
         AjaxIconButton assignButton = new AjaxIconButton(buttonId, new Model<>(GuiStyleConstants.EVO_ASSIGNMENT_ICON),
-                createStringResource("MainObjectListPanel.newObject")) {
+                createStringResource("TreeTablePanel.menu.addMembers")) {
 
             private static final long serialVersionUID = 1L;
 

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java b/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java
@@ -256,6 +256,11 @@ protected LoadableModel<MultiFunctinalButtonDto> loadButtonDescriptions() {
                 return loadMultiFunctionalButtonModel(true);
             }
 
+            @Override
+            protected String getTitleForNewObjectButton() {
+                return createStringResource("TreeTablePanel.menu.createMember").getString();
+            }
+
         };
         childrenListPanel.setOutputMarkupId(true);
         memberContainer.add(childrenListPanel);
@@ -508,7 +513,7 @@ private List<ObjectReferenceType> archetypeReferencesListForType(QName type) {
 
     private AjaxIconButton createAssignButton(String buttonId) {
         AjaxIconButton assignButton = new AjaxIconButton(buttonId, new Model<>(GuiStyleConstants.EVO_ASSIGNMENT_ICON),
-                createStringResource("MainObjectListPanel.newObject")) {
+                createStringResource("TreeTablePanel.menu.addMembers")) {
 
             private static final long serialVersionUID = 1L;