Gilad Chaplik has uploaded a new change for review.
Change subject: webadmin: cluster policy dialog - minor fixes
......................................................................
webadmin: cluster policy dialog - minor fixes
* Adding abillity to filter to have no position.
* Fixing dnd not disabled while cluster policy is locked.
Change-Id: I4698753320fecf24cc0fbf4e95af2c0ea8c57b31
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
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
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/PolicyUnitPanel.java
4 files changed, 21 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/34/17534/1
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
index 6d09492..51c7883 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
@@ -3039,6 +3039,9 @@
@DefaultStringValue("Last")
String lastFilter();
+ @DefaultStringValue("No Position")
+ String noPositionFilter();
+
@DefaultStringValue("Feedback")
String feedbackMessage();
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 d87cc13..c3864ad 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
@@ -170,7 +170,13 @@
}
unusedFunctionPanel.clear();
for (PolicyUnit policyUnit : model.getUnusedFunctions()) {
- functionPolicyUnitPanel = new FunctionPolicyUnitPanel(policyUnit,
model, false, false, style, null);
+ functionPolicyUnitPanel =
+ new FunctionPolicyUnitPanel(policyUnit,
+ model,
+ false,
+ model.getClusterPolicy().isLocked(),
+ style,
+ null);
unusedFunctionPanel.add(functionPolicyUnitPanel);
functionPolicyUnitPanel.initWidget();
}
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 9b5f962..3a3d2c1 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
@@ -55,7 +55,7 @@
}
.usedFilterPolicyUnitStyle {
height: 20px;
- width: 250px;
+ width: 240px;
background-color: #CED8DF;
border: 1px
solid
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/PolicyUnitPanel.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/PolicyUnitPanel.java
index d9aaceb..f46ff31 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/PolicyUnitPanel.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/panels/PolicyUnitPanel.java
@@ -138,6 +138,16 @@
protected void addSubMenu(MenuBar menuBar) {
MenuBar subMenu = new MenuBar(true);
+ if (position != 0) {
+ subMenu.addItem(constants.noPositionFilter(), new Command() {
+
+ @Override
+ public void execute() {
+ model.addFilter(policyUnit, used, 0);
+ menuPopup.hide();
+ }
+ });
+ }
if (position >= 0) {
subMenu.addItem(constants.firstFilter(), new Command() {
--
To view, visit http://gerrit.ovirt.org/17534
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4698753320fecf24cc0fbf4e95af2c0ea8c57b31
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
