Vojtech Szocs has uploaded a new change for review.
Change subject: webadmin: Element IDs in Assign Tags and Role dialogs
......................................................................
webadmin: Element IDs in Assign Tags and Role dialogs
1. Assign Tags dialog (Users main tab) now supports
element IDs for Tree nodes
2. Role dialog (Configure dialog | Roles tab) now supports
element IDs for Tree nodes and some other UI elements:
- Name and Description text box
- User and Admin radio button
- Expand and Collapse button
Change-Id: Ic37627d382d529fe7f8c11a55e6799a6d8617a6a
Signed-off-by: Vojtech Szocs <vsz...@redhat.com>
---
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AssignTagsPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.java
2 files changed, 30 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/55/14055/1
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AssignTagsPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AssignTagsPopupView.java
index 683cd54..532e6f7 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AssignTagsPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AssignTagsPopupView.java
@@ -4,6 +4,7 @@
import java.util.List;
import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
+import org.ovirt.engine.ui.common.idhandler.WithElementId;
import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView;
import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel;
import org.ovirt.engine.ui.uicommonweb.models.common.SelectionTreeNodeModel;
@@ -45,6 +46,7 @@
@UiField(provided = true)
@Ignore
+ @WithElementId
EntityModelCellTree<SelectionTreeNodeModel, SimpleSelectionTreeNodeModel>
tree;
private final Driver driver = GWT.create(Driver.class);
@@ -73,7 +75,6 @@
// Listen to Properties
object.getPropertyChangedEvent().addListener(new IEventListener() {
-
@Override
public void eventRaised(Event ev, Object sender, EventArgs args) {
TagListModel model = (TagListModel) sender;
@@ -131,12 +132,14 @@
}
interface AssignTagTreeResources extends CellTree.Resources {
+
interface TableStyle extends CellTree.Style {
}
@Override
@Source({ "org/ovirt/engine/ui/webadmin/css/AssignTagTree.css" })
TableStyle cellTreeStyle();
+
}
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.java
index b7f5c02..5ba619b 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/RolePopupView.java
@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.ovirt.engine.ui.common.idhandler.ElementIdHandler;
+import org.ovirt.engine.ui.common.idhandler.WithElementId;
import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView;
import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel;
import org.ovirt.engine.ui.common.widget.editor.EntityModelTextBoxEditor;
@@ -44,12 +46,18 @@
ViewUiBinder uiBinder = GWT.create(ViewUiBinder.class);
}
+ interface ViewIdHandler extends ElementIdHandler<RolePopupView> {
+ ViewIdHandler idHandler = GWT.create(ViewIdHandler.class);
+ }
+
@UiField
@Path(value = "name.entity")
+ @WithElementId("name")
EntityModelTextBoxEditor nameEditor;
@UiField
@Path(value = "description.entity")
+ @WithElementId("description")
EntityModelTextBoxEditor descriptionEditor;
@UiField
@@ -58,10 +66,12 @@
@UiField
@Ignore
+ @WithElementId("userRadioButton")
RadioButton userRadioButtonEditor;
@UiField
@Ignore
+ @WithElementId("adminRadioButton")
RadioButton adminRadioButtonEditor;
@UiField
@@ -70,14 +80,17 @@
@UiField
@Ignore
+ @WithElementId
Button expandAllButton;
@UiField
@Ignore
+ @WithElementId
Button collapseAllButton;
@UiField(provided = true)
@Ignore
+ @WithElementId
EntityModelCellTree<SelectionTreeNodeModel, SimpleSelectionTreeNodeModel>
tree;
private final Driver driver = GWT.create(Driver.class);
@@ -89,6 +102,7 @@
super(eventBus, resources);
initTree();
initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
+ ViewIdHandler.idHandler.generateAndSetIds(this);
driver.initialize(this);
localize(constants);
initExpandButtons();
@@ -97,7 +111,6 @@
private void initRadioButtons() {
userRadioButtonEditor.addClickHandler(new ClickHandler() {
-
@Override
public void onClick(ClickEvent event) {
if (userRadioButtonEditor.getValue()) {
@@ -105,9 +118,7 @@
}
}
});
-
adminRadioButtonEditor.addClickHandler(new ClickHandler() {
-
@Override
public void onClick(ClickEvent event) {
if (adminRadioButtonEditor.getValue()) {
@@ -115,26 +126,21 @@
}
}
});
-
}
private void initExpandButtons() {
expandAllButton.addClickHandler(new ClickHandler() {
-
@Override
public void onClick(ClickEvent event) {
expandTree();
}
});
-
collapseAllButton.addClickHandler(new ClickHandler() {
-
@Override
public void onClick(ClickEvent event) {
collapseTree();
}
});
-
}
private void initTree() {
@@ -158,9 +164,9 @@
this.roleModel = object;
driver.edit(object);
final EntityModel adminRole = object.getIsAdminRole();
+
// Listen to Properties
object.getPropertyChangedEvent().addListener(new IEventListener() {
-
@Override
public void eventRaised(Event ev, Object sender, EventArgs args) {
RoleModel model = (RoleModel) sender;
@@ -172,7 +178,6 @@
});
object.getIsAdminRole().getEntityChangedEvent().addListener(new
IEventListener() {
-
@Override
public void eventRaised(Event ev, Object sender, EventArgs args) {
if ((Boolean) adminRole.getEntity() == true) {
@@ -185,7 +190,6 @@
});
object.getIsAdminRole().getPropertyChangedEvent().addListener(new
IEventListener() {
-
@Override
public void eventRaised(Event ev, Object sender, EventArgs args) {
if (!adminRole.getIsChangable()) {
@@ -194,7 +198,6 @@
}
}
});
-
}
private void updateTree(RoleModel model) {
@@ -221,15 +224,6 @@
return driver.flush();
}
- interface AssignTagTreeResources extends CellTree.Resources {
- interface TableStyle extends CellTree.Style {
- }
-
- @Override
- @Source({ "org/ovirt/engine/ui/webadmin/css/RoleTree.css" })
- TableStyle cellTreeStyle();
- }
-
private void expandTree() {
if (tree != null) {
expandTree(tree.getRootTreeNode(), true);
@@ -254,4 +248,15 @@
}
}
+ interface AssignTagTreeResources extends CellTree.Resources {
+
+ interface TableStyle extends CellTree.Style {
+ }
+
+ @Override
+ @Source({ "org/ovirt/engine/ui/webadmin/css/RoleTree.css" })
+ TableStyle cellTreeStyle();
+
+ }
+
}
--
To view, visit http://gerrit.ovirt.org/14055
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic37627d382d529fe7f8c11a55e6799a6d8617a6a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vojtech Szocs <vsz...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
