Eli Mesika has uploaded a new change for review. Change subject: core: Upgrade message in general tab is missing ......................................................................
core: Upgrade message in general tab is missing Alert should distinguish if the host is already in maintenance or not. If the host is not in maintenance it should display : "A new version is available; an upgrade option will appear once the Host is moved to maintenance mode." If the host is in maintenance it should display : "If you wish to upgrade or reinstall it click here." Change-Id: I5af3adca237609dfa696828caa39919c7e4da82b Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1186196 Signed-off-by: emesika <emes...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/host/SubTabHostGeneralPresenter.java 2 files changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/37849/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java index 6638ad7..ff2de13 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationMessages.java @@ -8,6 +8,9 @@ @DefaultMessage("A new version is available; an upgrade option will appear once the Host is moved to maintenance mode.") String hostHasUpgradeAlert(); + @DefaultMessage("If you wish to upgrade or reinstall it click here.") + String hostInMaintenanceHasUpgradeAlert(); + @DefaultMessage("This host is in non responding state. Try to Activate it; If the problem persists, switch Host to Maintenance mode and try to reinstall it.") String hostHasReinstallAlertNonResponsive(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/host/SubTabHostGeneralPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/host/SubTabHostGeneralPresenter.java index b7918e3..ddf774d 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/host/SubTabHostGeneralPresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/host/SubTabHostGeneralPresenter.java @@ -1,6 +1,7 @@ package org.ovirt.engine.ui.webadmin.section.main.presenter.tab.host; import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.VDSStatus; import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.ui.common.place.PlaceRequestFactory; import org.ovirt.engine.ui.common.presenter.AbstractSubTabPresenter; @@ -113,7 +114,12 @@ // Review the alerts and add those that are active: if (model.getHasUpgradeAlert()) { - addTextAlert(view, messages.hostHasUpgradeAlert()); + if (model.getEntity().getStatus() == VDSStatus.Maintenance) { + addTextAlert(view, messages.hostInMaintenanceHasUpgradeAlert()); + } + else { + addTextAlert(view, messages.hostHasUpgradeAlert()); + } } if (model.getHasReinstallAlertNonResponsive()) { addTextAlert(view, messages.hostHasReinstallAlertNonResponsive()); -- To view, visit http://gerrit.ovirt.org/37849 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5af3adca237609dfa696828caa39919c7e4da82b Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emes...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
