Daniel Erez has uploaded a new change for review. Change subject: webadmin: guide me local cluster - added note on sd ......................................................................
webadmin: guide me local cluster - added note on sd Local Cluster/DC GuideMe dialog: * Replaced 'Fully configured and ready for use' message with 'Configuration completed' - as in shared storage. * Added a note that a local storage domain must be attached to the DC and activated. Change-Id: Ic2f3f59cdcf30721bbefc9bb84d97973faa36f99 Bug-Url: https://bugzilla.redhat.com/1023484 Signed-off-by: Daniel Erez <de...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/GuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.ui.xml 6 files changed, 40 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/74/24074/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/GuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/GuideModel.java index 2d16f86..3f58ec2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/GuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/GuideModel.java @@ -42,9 +42,23 @@ } } + private EntityModel<String> note; + + public EntityModel<String> getNote() + { + return note; + } + + public void setNote(EntityModel<String> value) + { + note = value; + } + public GuideModel() { setCompulsoryActions(new ObservableCollection<UICommand>()); setOptionalActions(new ObservableCollection<UICommand>()); + setNote(new EntityModel<String>()); + getNote().setIsAvailable(false); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java index 4b02f46..9f0152d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java @@ -203,6 +203,9 @@ addHostAction.setIsExecutionAllowed(false); selectHost.getExecuteProhibitionReasons().add(hasHostReason); selectHost.setIsExecutionAllowed(false); + + getNote().setIsAvailable(true); + getNote().setEntity(ConstantsManager.getInstance().getConstants().attachLocalStorageDomainToFullyConfigure()); } getCompulsoryActions().add(addHostAction); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java index 91a0c15..20da4b0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java @@ -507,6 +507,9 @@ UICommand addLocalStorageAction = tempVar8; getOptionalActions().add(addLocalStorageAction); } + + getNote().setIsAvailable(true); + getNote().setEntity(ConstantsManager.getInstance().getConstants().attachLocalStorageDomainToFullyConfigure()); } else if (getEntity().getStatus() != StoragePoolStatus.Uninitialized) { 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 70c5636..051b852 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 @@ -935,6 +935,9 @@ @DefaultStringValue("This Cluster belongs to a Local Data Center which already contain a Host") String thisClusterBelongsToALocalDcWhichAlreadyContainHostClusterGuide(); + @DefaultStringValue("Note: at least one local Storage Domain should be attached to the Data-Center and activated.") + String attachLocalStorageDomainToFullyConfigure(); + @DefaultStringValue("Name must be unique.") String nameMustBeUniqueInvalidReason(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java index 005e08f..9da3ded 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.java @@ -57,6 +57,10 @@ @UiField @Ignore + Label noteLabel; + + @UiField + @Ignore Label optionalActionsLabel; @UiField @@ -140,7 +144,13 @@ } if (!hasAllowedActions) { - infoLabel.setText(message); + if (!guideModel.getNote().getIsAvailable()) { + infoLabel.setText(message); + } + else { + infoLabel.setText(configurationCompleted); + noteLabel.setText(guideModel.getNote().getEntity()); + } compulsorySection.setVisible(false); optionalSection.setVisible(false); // Rename dialog button. diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.ui.xml index 89fd127..4a41aeb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/guide/GuidePopupView.ui.xml @@ -12,6 +12,11 @@ font-weight: bold; } + .noteLabel { + padding-top: 10px; + font-weight: normal; + } + .section { padding-left: 15px; padding-top: 15px; @@ -41,6 +46,7 @@ <g:FlowPanel> <g:VerticalPanel addStyleNames="{style.infoPanel}"> <g:Label ui:field="infoLabel"/> + <g:Label ui:field="noteLabel" addStyleNames="{style.noteLabel}"/> </g:VerticalPanel> <g:VerticalPanel ui:field="compulsorySection" addStyleNames="{style.section}" visible="false"> <g:Label ui:field="compulsoryActionsLabel" addStyleNames="{style.actionsLabel}"/> -- To view, visit http://gerrit.ovirt.org/24074 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2f3f59cdcf30721bbefc9bb84d97973faa36f99 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
