Idan Shaby has uploaded a new change for review. Change subject: webadmin: Add wipe after delete to Disks general tab ......................................................................
webadmin: Add wipe after delete to Disks general tab This patch adds the "Wipe After Delete" property to the Disks general subtab. Change-Id: Ied0d95b0425c626c2a25f1ca5167988ae371cf23 Bug-Url: https://bugzilla.redhat.com/1136098 Signed-off-by: Idan Shaby <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskGeneralModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java 2 files changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/38854/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskGeneralModel.java index 76b204b..07c3910 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskGeneralModel.java @@ -111,6 +111,19 @@ } } + private boolean wipeAfterDelete; + + public boolean getWipeAfterDelete() { + return wipeAfterDelete; + } + + public void setWipeAfterDelete(boolean wipeAfterDelete) { + if (this.wipeAfterDelete != wipeAfterDelete) { + this.wipeAfterDelete = wipeAfterDelete; + onPropertyChanged(new PropertyChangedEventArgs("WipeAfterDelete")); //$NON-NLS-1$ + } + } + private String privateDiskProfileName; public String getDiskProfileName() @@ -219,6 +232,8 @@ setAlignment(disk.getAlignment().toString()); } + setWipeAfterDelete(disk.isWipeAfterDelete()); + if (isImage()) { DiskImage diskImage = (DiskImage) disk; setDiskProfileName(StringUtils.join(diskImage.getDiskProfileNames(), ", ")); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java index fc81de6..7dcb0c5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/disk/SubTabDiskGeneralView.java @@ -10,6 +10,7 @@ import org.ovirt.engine.ui.common.widget.form.FormBuilder; import org.ovirt.engine.ui.common.widget.form.FormItem; import org.ovirt.engine.ui.common.widget.form.GeneralFormPanel; +import org.ovirt.engine.ui.common.widget.label.BooleanLabel; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; import org.ovirt.engine.ui.uicommonweb.models.disks.DiskGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.disks.DiskListModel; @@ -44,6 +45,7 @@ TextBoxLabel diskProfileName = new TextBoxLabel(); TextBoxLabel quotaName = new TextBoxLabel(); TextBoxLabel alignment = new TextBoxLabel(); + BooleanLabel wipeAfterDelete = new BooleanLabel(constants.yes(), constants.no()); @UiField(provided = true) @WithElementId @@ -68,7 +70,7 @@ generateIds(); // Build a form using the FormBuilder - formBuilder = new FormBuilder(formPanel, 1, 7); + formBuilder = new FormBuilder(formPanel, 1, 8); formBuilder.addFormItem(new FormItem(constants.aliasDisk(), alias, 0, 0)); formBuilder.addFormItem(new FormItem(constants.descriptionDisk(), description, 1, 0)); @@ -92,6 +94,8 @@ return getDetailModel().isQuotaAvailable(); } }); + formBuilder.addFormItem(new FormItem(constants.wipeAfterDelete(), wipeAfterDelete, 7, 0)); + formBuilder.setRelativeColumnWidth(0, 3); } -- To view, visit https://gerrit.ovirt.org/38854 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied0d95b0425c626c2a25f1ca5167988ae371cf23 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Idan Shaby <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
