Daniel Erez has uploaded a new change for review.

Change subject: webadmin: edit disk - hide attach checkbox (#854543)
......................................................................

webadmin: edit disk - hide attach checkbox (#854543)

Edit disk dialog:
hide 'Attach Disk' check-box since it's not relevant for 'Edit' dialog.

Change-Id: I85e53c00e0642da1e7f32b29776c2954d6f905d9
Bug-Url: https://bugzilla.redhat.com/854543
Signed-off-by: Daniel Erez <de...@redhat.com>
---
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/8259/1

diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java
index 7f65125..2bd5d48 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java
@@ -521,7 +521,7 @@
             @Override
             public void eventRaised(Event ev, Object sender, EventArgs args) {
                 boolean isInVm = (Boolean) ((EntityModel) sender).getEntity();
-                topPanel.setVisible(isInVm);
+                topPanel.setVisible(isInVm && 
disk.getAttachDisk().getIsAvailable());
                 aliasEditor.setFocus(!isInVm);
             }
         });
diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
index 6a16db4..11355ab 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
@@ -403,12 +403,12 @@
         model.setDisk(disk);
         model.setIsNew(false);
         setWindow(model);
-        model.getIsInVm().setEntity(true);
-        model.getIsInternal().setEntity(disk.getDiskStorageType() == 
DiskStorageType.IMAGE);
         
model.setTitle(ConstantsManager.getInstance().getConstants().editVirtualDiskTitle());
         model.setHashName("edit_virtual_disk"); //$NON-NLS-1$
+        model.getAttachDisk().setIsAvailable(false);
+        model.getIsInVm().setEntity(true);
+        model.getIsInternal().setEntity(disk.getDiskStorageType() == 
DiskStorageType.IMAGE);
         model.getStorageDomain().setIsChangable(false);
-        model.getAttachDisk().setIsChangable(false);
         model.getHost().setIsChangable(false);
         model.getStorageType().setIsChangable(false);
         model.getDataCenter().setIsChangable(false);


--
To view, visit http://gerrit.ovirt.org/8259
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85e53c00e0642da1e7f32b29776c2954d6f905d9
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Daniel Erez <de...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to