Vojtech Szocs has uploaded a new change for review. Change subject: webadmin,userportal: Fix action table element IDs ......................................................................
webadmin,userportal: Fix action table element IDs This patch fixes a problem in AbstractActionTable which uses two table widgets internally (optional header + main table). Since both above mentioned table widgets are now derived from ColumnResizeCellTable, and sice column definition objects are shared between both tables, we must not set element IDs for the optional header table. Change-Id: I318338a8e92b3967b4ce40ac288add846f0a1444 Bug-Url: https://bugzilla.redhat.com/960519 Signed-off-by: Vojtech Szocs <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/ElementIdCellTable.java 2 files changed, 7 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/14546/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java index cd95534..dc489b6 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java @@ -202,6 +202,12 @@ table.resizeColumn(column, newWidth); } + @Override + protected void configureElementId(Column<T, ?> column) { + // No-op, don't set element ID here, since column + // instances are shared between main and header table + } + }; this.tableHeader.setRowData(new ArrayList<T>()); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/ElementIdCellTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/ElementIdCellTable.java index ee276a7..49d7171 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/ElementIdCellTable.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/ElementIdCellTable.java @@ -70,7 +70,7 @@ * <p> * This method overrides the default column ID that will be part of the resulting DOM element ID. */ - protected void configureElementId(Column<T, ?> column, String columnId) { + void configureElementId(Column<T, ?> column, String columnId) { if (column instanceof ColumnWithElementId) { ((ColumnWithElementId) column).configureElementId(elementId, columnId); } @@ -79,11 +79,6 @@ @Override public void setElementId(String elementId) { this.elementId = elementId; - - // Update existing columns - for (int i = 0; i < getColumnCount(); i++) { - configureElementId(getColumn(i)); - } } public String getElementId() { -- To view, visit http://gerrit.ovirt.org/14546 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I318338a8e92b3967b4ce40ac288add846f0a1444 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Vojtech Szocs <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
