Frank Kobzik has uploaded a new change for review. Change subject: userportal: Adjust protocol message ......................................................................
userportal: Adjust protocol message This patch corrects protocol message in Basic User Portal. Previously the message contained confusing information. Fixed by displaying protocol name for selected VM/Pool. Also removed some duplicate code. Change-Id: I12a3746c70ce9fdb84e8807fc469f8f0cdb3c812 Bug-Url: https://bugzilla.redhat.com/1078138 Signed-off-by: Frantisek Kobzik <[email protected]> --- M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/basic/MainTabBasicDetailsView.java 2 files changed, 12 insertions(+), 19 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/30537/1 diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java index 5b42bb9..419135b 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/tab/basic/MainTabBasicDetailsPresenterWidget.java @@ -37,9 +37,7 @@ void editDistItems(Iterable<DiskImage> diskImages); - void setConsoleWarningMessage(String message); - - void setConsoleProtocol(String protocol); + void setConsoleProtocolMessage(String protocol); void setConsoleConnectLinkEnabled(boolean enabled); @@ -199,12 +197,7 @@ getView().setConsoleConnectLinkEnabled(canConnectToConsole(item)); getView().setEditConsoleEnabled(isEditConsoleEnabled(item)); - - if (!item.getVmConsoles().canConnectToConsole()) { - getView().setConsoleWarningMessage(item.getVmConsoles().cannotConnectReason()); - } else { - getView().setConsoleProtocol(determineProtocolMessage(item.getVmConsoles())); - } + getView().setConsoleProtocolMessage(determineProtocolMessage(item.getVmConsoles())); } private boolean canConnectToConsole(UserPortalItemModel item) { @@ -216,14 +209,20 @@ } private String determineProtocolMessage(VmConsoles vmConsoles) { - boolean smartcardEnabled = vmConsoles.getSelectedProcotol() == ConsoleProtocol.SPICE && vmConsoles.getVm().isSmartcardEnabled(); + ConsoleProtocol selectedProcotol = vmConsoles.getSelectedProcotol(); + + if (selectedProcotol == null) { + return ""; + } + + boolean smartcardEnabled = selectedProcotol == ConsoleProtocol.SPICE && vmConsoles.getVm().isSmartcardEnabled(); boolean smartcardOverriden = vmConsoles.getConsoleModel(SpiceConsoleModel.class).getspice().isSmartcardEnabledOverridden(); if (smartcardEnabled && !smartcardOverriden) { - return messages.consoleWithSmartcard(consoleTypeToName.get(vmConsoles.getSelectedProcotol())); + return messages.consoleWithSmartcard(consoleTypeToName.get(selectedProcotol)); } - return consoleTypeToName.get(vmConsoles.getSelectedProcotol()); + return consoleTypeToName.get(selectedProcotol); } private boolean isEditConsoleEnabled(UserPortalItemModel item) { diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/basic/MainTabBasicDetailsView.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/basic/MainTabBasicDetailsView.java index 3f9e92d..424ed2d 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/basic/MainTabBasicDetailsView.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/tab/basic/MainTabBasicDetailsView.java @@ -144,14 +144,8 @@ } @Override - public void setConsoleWarningMessage(String message) { + public void setConsoleProtocolMessage(String message) { protocolMessage.setText(message); - protocolMessage.setStyleName(style.protocolWarning()); - } - - @Override - public void setConsoleProtocol(String protocolName) { - protocolMessage.setText(protocolName); protocolMessage.setStyleName(style.protocolWarning()); } -- To view, visit http://gerrit.ovirt.org/30537 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12a3746c70ce9fdb84e8807fc469f8f0cdb3c812 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
