Martin Betak has uploaded a new change for review. Change subject: frontend: Fix Column Sizing in AddVmHostDevicePopupView ......................................................................
frontend: Fix Column Sizing in AddVmHostDevicePopupView Change-Id: I4b9a6a3441f95a1dcabaf38105477427aaa85afa Signed-off-by: Martin Betak <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/AddVmHostDevicePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/AddVmHostDevicePopupView.ui.xml M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostDeviceView.java 3 files changed, 18 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/41787/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/AddVmHostDevicePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/AddVmHostDevicePopupView.java index 74651d5..f55be2c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/AddVmHostDevicePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/AddVmHostDevicePopupView.java @@ -88,46 +88,46 @@ private void initHostDeviceCellTable(EntityModelCellTable<ListModel<EntityModel<HostDeviceView>>> hostDeviceTable) { hostDeviceTable.enableColumnResizing(); - addHostDeviceColumn(hostDeviceTable, constants.deviceName(), new AbstractTextColumn<EntityModel<HostDeviceView>>() { + addHostDeviceColumn(hostDeviceTable, constants.deviceName(), "200px", new AbstractTextColumn<EntityModel<HostDeviceView>>() { // $NON-NLS-1$ @Override public String getValue(EntityModel<HostDeviceView> hostDevice) { return hostDevice.getEntity().getDeviceName(); } }); - addHostDeviceColumn(hostDeviceTable, constants.product(), new AbstractTextColumn<EntityModel<HostDeviceView>>() { + addHostDeviceColumn(hostDeviceTable, constants.product(), "350px", new AbstractTextColumn<EntityModel<HostDeviceView>>() { @Override - public String getValue(EntityModel<HostDeviceView> hostDevice) { + public String getValue(EntityModel<HostDeviceView> hostDevice) { // $NON-NLS-1$ return renderNameId( hostDevice.getEntity().getProductName(), hostDevice.getEntity().getProductId()); } }); - addHostDeviceColumn(hostDeviceTable, constants.vendor(), new AbstractTextColumn<EntityModel<HostDeviceView>>() { + addHostDeviceColumn(hostDeviceTable, constants.vendor(), "200px", new AbstractTextColumn<EntityModel<HostDeviceView>>() { @Override - public String getValue(EntityModel<HostDeviceView> hostDevice) { + public String getValue(EntityModel<HostDeviceView> hostDevice) { // $NON-NLS-1$ return renderNameId( hostDevice.getEntity().getVendorName(), hostDevice.getEntity().getVendorId()); } }); - addHostDeviceColumn(hostDeviceTable, constants.currentlyUsedByVm(), new AbstractTextColumn<EntityModel<HostDeviceView>>() { + addHostDeviceColumn(hostDeviceTable, constants.currentlyUsedByVm(), "150px", new AbstractTextColumn<EntityModel<HostDeviceView>>() { @Override public String getValue(EntityModel<HostDeviceView> hostDevice) { return hostDevice.getEntity().getRunningVmName(); } }); - addHostDeviceColumn(hostDeviceTable, constants.attachedToVms(), new AbstractTextColumn<EntityModel<HostDeviceView>>() { + addHostDeviceColumn(hostDeviceTable, constants.attachedToVms(), "150px", new AbstractTextColumn<EntityModel<HostDeviceView>>() { @Override public String getValue(EntityModel<HostDeviceView> hostDevice) { return StringUtils.join(hostDevice.getEntity().getAttachedVmNames(), ", "); // $NON-NLS-1$ } }); - addHostDeviceColumn(hostDeviceTable, constants.iommuGroup(), new AbstractTextColumn<EntityModel<HostDeviceView>>() { + addHostDeviceColumn(hostDeviceTable, constants.iommuGroup(), "150px", new AbstractTextColumn<EntityModel<HostDeviceView>>() { // $NON-NLS-1$ @Override public String getValue(EntityModel<HostDeviceView> hostDevice) { return hostDevice.getEntity().getIommuGroup() == null ? constants.notAvailableLabel() : hostDevice.getEntity().getIommuGroup().toString(); @@ -136,16 +136,17 @@ } private String renderNameId(String name, String id) { - if (id == null) { - return name; + if (StringUtils.isEmpty(name)) { + return id; } + // we assume that VDSM will never report name != null && id == null return messages.nameId(name, id); } private void addHostDeviceColumn(EntityModelCellTable<ListModel<EntityModel<HostDeviceView>>> hostDeviceTable, - String header, AbstractTextColumn<EntityModel<HostDeviceView>> column) { + String header, String width, AbstractTextColumn<EntityModel<HostDeviceView>> column) { column.makeSortable(); - hostDeviceTable.addColumn(column, header); + hostDeviceTable.addColumn(column, header, width); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/AddVmHostDevicePopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/AddVmHostDevicePopupView.ui.xml index d6ee507..51a4191 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/AddVmHostDevicePopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/vm/AddVmHostDevicePopupView.ui.xml @@ -9,7 +9,7 @@ <ui:with field="constants" type="org.ovirt.engine.ui.webadmin.ApplicationConstants" /> - <d:SimpleDialogPanel width="1200px" height="800px"> + <d:SimpleDialogPanel width="1280px" height="800px"> <d:content> <g:FlowPanel> <g:FlowPanel> diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostDeviceView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostDeviceView.java index 38bed10..da9475f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostDeviceView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostDeviceView.java @@ -34,25 +34,25 @@ public void initTable() { getTable().enableColumnResizing(); - addColumn(constants.deviceName(), "150px", new AbstractTextColumn<HostDeviceView>() { //$NON-NLS-1$ + addColumn(constants.deviceName(), "350px", new AbstractTextColumn<HostDeviceView>() { //$NON-NLS-1$ @Override public String getValue(HostDeviceView object) { return object.getDeviceName(); } }); - addColumn(constants.iommuGroup(), "50px", new AbstractTextColumn<HostDeviceView>() { //$NON-NLS-1$ + addColumn(constants.iommuGroup(), "100px", new AbstractTextColumn<HostDeviceView>() { //$NON-NLS-1$ @Override public String getValue(HostDeviceView object) { return object.getIommuGroup() == null ? constants.notAvailableLabel() : object.getIommuGroup().toString(); } }); - addColumn(constants.capability(), "30px", new AbstractTextColumn<HostDeviceView>() { //$NON-NLS-1$ + addColumn(constants.capability(), "100px", new AbstractTextColumn<HostDeviceView>() { //$NON-NLS-1$ @Override public String getValue(HostDeviceView object) { return object.getCapability(); } }); - addColumn(constants.productName(), "150px", new AbstractTextColumn<HostDeviceView>() { //$NON-NLS-1$ + addColumn(constants.product(), "350px", new AbstractTextColumn<HostDeviceView>() { //$NON-NLS-1$ @Override public String getValue(HostDeviceView object) { return object.getProductName(); -- To view, visit https://gerrit.ovirt.org/41787 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4b9a6a3441f95a1dcabaf38105477427aaa85afa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
