Hello Fred Rolland,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/37585
to review the following change.
Change subject: webadmin: Add RO column in Template's Disk sub-tab
......................................................................
webadmin: Add RO column in Template's Disk sub-tab
In the Disks sub tab in the Templates list, an additional column for the
Read Only state of the disks has been added.
The value for RO will be R/O and for RW it will be empty as in other
views.
Change-Id: I6d898656b0b8c497701c06cd1f28252bfb0fb8f9
Bug-Url: https://bugzilla.redhat.com/1057716
Signed-off-by: Fred Rolland <[email protected]>
---
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateDiskView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java
2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/37585/1
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateDiskView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateDiskView.java
index b061dfc..be82a2f 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateDiskView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/template/SubTabTemplateDiskView.java
@@ -18,6 +18,9 @@
import org.ovirt.engine.ui.webadmin.widget.template.DisksTree;
import com.google.gwt.event.shared.EventBus;
+import com.google.gwt.safehtml.shared.SafeHtml;
+import com.google.gwt.safehtml.shared.SafeHtmlUtils;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.inject.Inject;
public class SubTabTemplateDiskView extends AbstractSubTabTreeView<DisksTree,
VmTemplate, DiskModel, TemplateListModel, TemplateDiskListModel> implements
SubTabTemplateDiskPresenter.ViewDef {
@@ -50,6 +53,9 @@
@Override
protected void initHeader(ApplicationConstants constants) {
table.addColumn(new EmptyColumn(), constants.aliasDisk(), "");
//$NON-NLS-1$
+ SafeHtml readOnlyColumnHeader =
templates.imageWithTitle(SafeHtmlUtils.fromTrustedString(
+
AbstractImagePrototype.create(resources.readOnlyDiskIcon()).getHTML()),
constants.readOnly());
+ table.addColumn(new EmptyColumn(), readOnlyColumnHeader, "60px");
//$NON-NLS-1$);
table.addColumn(new EmptyColumn(), constants.provisionedSizeDisk(),
"120px"); //$NON-NLS-1$
table.addColumn(new EmptyColumn(), constants.sizeDisk(), "120px");
//$NON-NLS-1$
table.addColumn(new EmptyColumn(), constants.statusDisk(), "120px");
//$NON-NLS-1$
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java
index 6981d36..dbd4280 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/template/DisksTree.java
@@ -50,6 +50,7 @@
addItemToPanel(panel, new Image(resources.diskImage()), "25px");
//$NON-NLS-1$
addTextBoxToPanel(panel, new TextBoxLabel(), disk.getDiskAlias(), "");
//$NON-NLS-1$
+ addItemToPanel(panel, disk.getReadOnly() ? new
Image(resources.readOnlyDiskIcon()) :new Image(), "60px"); //$NON-NLS-1$
addValueLabelToPanel(panel, new DiskSizeLabel<Long>(),
disk.getSizeInGigabytes(), "120px"); //$NON-NLS-1$
addValueLabelToPanel(panel, new
DiskSizeLabel<Long>(SizeConverter.SizeUnit.BYTES), disk.getActualSizeInBytes(),
"120px"); //$NON-NLS-1$
addValueLabelToPanel(panel, new EnumLabel<ImageStatus>(),
disk.getImageStatus(), "120px"); //$NON-NLS-1$
--
To view, visit http://gerrit.ovirt.org/37585
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d898656b0b8c497701c06cd1f28252bfb0fb8f9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Freddy Rolland <[email protected]>
Gerrit-Reviewer: Fred Rolland <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
