Lior Vernia has uploaded a new change for review. Change subject: webadmin: Mention host's name in Setup Networks title ......................................................................
webadmin: Mention host's name in Setup Networks title Added the host name to the dialog's title, so that users will easily be aware of which host's networks they're configuring. Change-Id: Id3eaa163564846f2c24e1e86e49b7ec3879dcf85 Bug-Url: https://bugzilla.redhat.com/1114882 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java 5 files changed, 10 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/20/29820/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java index 49a770a..76d0996 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java @@ -2160,11 +2160,8 @@ return; } - HostSetupNetworksModel setupNetworksWindowModel = new HostSetupNetworksModel(this); + HostSetupNetworksModel setupNetworksWindowModel = new HostSetupNetworksModel(this, getEntity()); setWindow(setupNetworksWindowModel); - - // set entity - setupNetworksWindowModel.setEntity(getEntity()); } private void updateActionAvailability() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index 69e60b8..6a38d33 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -151,10 +151,11 @@ public static final String NETWORK = "network"; //$NON-NLS-1$ public static final String LABEL = "label"; //$NON-NLS-1$ - public HostSetupNetworksModel(SearchableListModel listModel) { + public HostSetupNetworksModel(SearchableListModel listModel, VDS host) { this.sourceListModel = listModel; + setEntity(host); - setTitle(ConstantsManager.getInstance().getConstants().setupHostNetworksTitle()); + setTitle(ConstantsManager.getInstance().getMessages().setupHostNetworksTitle(host.getName())); setHelpTag(HelpTag.host_setup_networks); setHashName("host_setup_networks"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java index 060cab3..6e55535 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostListModel.java @@ -155,11 +155,9 @@ return; } - HostSetupNetworksModel setupNetworksWindowModel = new HostSetupNetworksModel(this); - - // set entity - setupNetworksWindowModel.setEntity(((PairQueryable<VdsNetworkInterface, VDS>) getSelectedItem()).getSecond()); - + HostSetupNetworksModel setupNetworksWindowModel = + new HostSetupNetworksModel(this, + ((PairQueryable<VdsNetworkInterface, VDS>) getSelectedItem()).getSecond()); setWindow(setupNetworksWindowModel); } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index 7c52a3a..6a53e3a 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -58,9 +58,6 @@ @DefaultStringValue("Join Bonds") String joinBondsTitle(); - @DefaultStringValue("Setup Host Networks") - String setupHostNetworksTitle(); - @DefaultStringValue("Manage Networks") String assignDetachNetworksTitle(); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java index ebf2e2f..677cd6d 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java @@ -153,6 +153,9 @@ @DefaultMessage("Edit Network {0}") String editNetworkTitle(String name); + @DefaultMessage("Setup Host {0} Networks") + String setupHostNetworksTitle(String hostName); + @DefaultMessage("({0} bricks selected)") String noOfBricksSelected(int brickCount); -- To view, visit http://gerrit.ovirt.org/29820 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3eaa163564846f2c24e1e86e49b7ec3879dcf85 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
