[openmeetings] branch master updated: [OPENMEETINGS-2604] extras visibility is enhanced

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new a9747db  [OPENMEETINGS-2604] extras visibility is enhanced
a9747db is described below

commit a9747db13749afa9a43f84130d1e704980545f1f
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Sun Jun 20 01:25:18 2021 +0700

    [OPENMEETINGS-2604] extras visibility is enhanced
---
 .../java/org/apache/openmeetings/web/common/menu/OmMenuItem.java     | 4 ++++
 .../java/org/apache/openmeetings/web/room/menu/ExtrasSubMenu.java    | 5 +----
 .../java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java    | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
index 0382bfb..75373dc 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/OmMenuItem.java
@@ -86,6 +86,10 @@ public class OmMenuItem implements INavbarComponent {
                this.visible = visible;
        }
 
+       public boolean hasItems() {
+               return !items.isEmpty();
+       }
+
        @Override
        public AbstractLink create(String markupId) {
                AbstractLink item;
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ExtrasSubMenu.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ExtrasSubMenu.java
index 818d19f..5a5a524 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ExtrasSubMenu.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/ExtrasSubMenu.java
@@ -64,13 +64,10 @@ public class ExtrasSubMenu implements Serializable {
                                }
                        });
                }
+               extraMenu.setVisible(extraMenu.hasItems());
        }
 
        OmMenuItem getMenu() {
                return extraMenu;
        }
-
-       public void update(final boolean moder) {
-               extraMenu.setVisible(moder);
-       }
 }
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index 39e0b4f..d96d16f 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -208,7 +208,6 @@ public class RoomMenuPanel extends Panel {
                boolean moder = room.getClient().hasRight(Room.Right.MODERATOR);
                actionsSubMenu.update(moder, notExternalUser);
                pollsSubMenu.update(moder, notExternalUser, r);
-               extrasSubMenu.update(moder);
                menuPanel.update(handler);
                StringBuilder roomClass = new StringBuilder("room name");
                String roomTitle = "";