Alona Kaplan has uploaded a new change for review. Change subject: webadmin: removing menu header from the menu in setup network dialog ......................................................................
webadmin: removing menu header from the menu in setup network dialog Removing the "menu for" header from the menu in setup network dialog. Bug-Url: https://bugzilla.redhat.com/1009774 Change-Id: I5634479c91046987591875954b3995fcd25c6d17 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/MenuBar.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java 2 files changed, 8 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/25381/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/MenuBar.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/MenuBar.java index b77e76c..a69d826 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/MenuBar.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/MenuBar.java @@ -61,4 +61,7 @@ } } + public boolean isEmpty(){ + return getItems() == null || getItems().isEmpty(); + } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java index 749a2a3..417dd65 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java @@ -204,15 +204,15 @@ private MenuBar rootMenu(NetworkItemModel<?> item) { MenuBar menuBar = new MenuBar(true); - menuBar.addItem("Menu for " + item.getName(), (Command) null); //$NON-NLS-1$ - menuBar.addSeparator(); return menuBar; } private void showContextMenu(NetworkItemPanel panel, int clientX, int clientY) { - menuPopup.setWidget(menu); - menuPopup.setPopupPosition(clientX, clientY); - menuPopup.show(); + if (!menu.isEmpty()){ + menuPopup.setWidget(menu); + menuPopup.setPopupPosition(clientX, clientY); + menuPopup.show(); + } } private MenuBar subMenu() { -- To view, visit http://gerrit.ovirt.org/25381 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5634479c91046987591875954b3995fcd25c6d17 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
