Artyom Lukianov has uploaded a new change for review. Change subject: webadmin: Not show aid instruction on non-editable cluster policy dialog ......................................................................
webadmin: Not show aid instruction on non-editable cluster policy dialog Change-Id: Iab405ae44b9ad74984cc343dfee12ed28a85e302 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=995571 Signed-off-by: Artyom Lukianov <aluki...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml 2 files changed, 30 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/27975/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java index e22bc7f..b92457b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.java @@ -69,6 +69,14 @@ @UiField @Ignore + Label filterExplanationMessage; + + @UiField + @Ignore + Label weightExplanationMessage; + + @UiField + @Ignore protected KeyValueWidget<KeyValueModel> customPropertiesSheetEditor; @UiField(provided = true) @@ -147,6 +155,8 @@ private void localize(ApplicationConstants constants) { nameEditor.setLabel(constants.clusterPolicyNameLabel()); descriptionEditor.setLabel(constants.clusterPolicyDescriptionLabel()); + filterExplanationMessage.setText(constants.clusterPolicyExplanationMessage()); + weightExplanationMessage.setText(constants.clusterPolicyExplanationMessage()); } public boolean showClusterPolicyPropertiesZone(final NewClusterPolicyModel model) { @@ -241,6 +251,10 @@ if (selectedItem != null) { loadBalanceListEditor.getElement().setTitle(selectedItem.getDescription()); String text = ""; //$NON-NLS-1$ + if (model.getClusterPolicy().isLocked()){ + filterExplanationMessage.setText(text); + weightExplanationMessage.setText(text); + } if (!selectedItem.isInternal()) { text = constants.externalPolicyUnitLabel() + " "; //$NON-NLS-1$ } @@ -330,5 +344,19 @@ String usedFilterPolicyUnitStyle(); String positionLabelStyle(); + + String panelHeaderLabelStyle(); + + String sectionLabel(); + + String externalLabel(); + + String labelStyle(); + + String policyListPanel(); + + String separator(); + + String iconInfoStyle(); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml index ef6c295..613d4d8 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/ClusterPolicyPopupView.ui.xml @@ -93,8 +93,7 @@ <g:HorizontalPanel> <g:Label addStyleNames="{style.sectionLabel}" text="{constants.clusterPolicyFilterLabel}" /> - <g:Label addStyleNames="{style.labelStyle}" - text="{constants.clusterPolicyExplanationMessage}" /> + <g:Label ui:field="filterExplanationMessage" addStyleNames="{style.labelStyle}"/> <d:InfoIcon ui:field="filterInfoIcon" addStyleNames="{style.iconInfoStyle}"/> </g:HorizontalPanel> <g:HTML> @@ -125,8 +124,7 @@ <g:HorizontalPanel> <g:Label addStyleNames="{style.sectionLabel}" text="{constants.clusterPolicyFunctionLabel}" /> - <g:Label addStyleNames="{style.labelStyle}" - text="{constants.clusterPolicyExplanationMessage}" /> + <g:Label ui:field="weightExplanationMessage" addStyleNames="{style.labelStyle}"/> <d:InfoIcon ui:field="functionInfoIcon" addStyleNames="{style.iconInfoStyle}"/> </g:HorizontalPanel> <g:HTML> -- To view, visit http://gerrit.ovirt.org/27975 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iab405ae44b9ad74984cc343dfee12ed28a85e302 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Artyom Lukianov <aluki...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
