Maor Lipchuk has uploaded a new change for review.

Change subject: webadmin: add CinderVolumeType to disk dialog
......................................................................

webadmin: add CinderVolumeType to disk dialog

Adding 'Volume Type' editor to add/edit Cinder disk dialog.

Change-Id: Iacfd46fb0e2965788cf46d1d078dffede5fb8d3a
Bug-Url: https://bugzilla.redhat.com/1185826
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.java
M 
frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml
3 files changed, 14 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/39049/1

diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
index 565e1c2..a7392b9 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java
@@ -993,6 +993,9 @@
     @DefaultStringValue("Allocation Policy")
     String allocationDisk();
 
+    @DefaultStringValue("Volume Type")
+    String cinderVolumeTypeDisk();
+
     @DefaultStringValue("Interface")
     String interfaceDisk();
 
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 ee22491..aafb3e7 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
@@ -109,6 +109,11 @@
     ListModelListBoxEditor<VolumeType> volumeTypeEditor;
 
     @UiField(provided = true)
+    @Path("cinderVolumeType.selectedItem")
+    @WithElementId("cinderVolumeType")
+    ListModelListBoxEditor<String> cinderVolumeTypeEditor;
+
+    @UiField(provided = true)
     @Path("diskProfile.selectedItem")
     @WithElementId("diskProfile")
     ListModelListBoxEditor<DiskProfile> diskProfileEditor;
@@ -221,6 +226,7 @@
         diskProfileEditor.setLabel(constants.diskProfileVmDiskPopup());
         interfaceEditor.setLabel(constants.interfaceVmDiskPopup());
         volumeTypeEditor.setLabel(constants.allocationDisk());
+        cinderVolumeTypeEditor.setLabel(constants.cinderVolumeTypeDisk());
         storageTypeEditor.setLabel(constants.storageTypeVmDiskPopup());
         plugDiskToVmEditor.setLabel(constants.activateVmDiskPopup());
         wipeAfterDeleteEditor.setLabel(constants.wipeAfterDeleteVmDiskPopup());
@@ -244,6 +250,8 @@
         interfaceEditor = new ListModelListBoxEditor<>(new EnumRenderer());
 
         datacenterEditor = new ListModelListBoxEditor<>(new 
NameRenderer<StoragePool>());
+
+        cinderVolumeTypeEditor = new ListModelListBoxEditor<>();
 
         volumeTypeEditor = new ListModelListBoxEditor<>(new EnumRenderer());
         storageTypeEditor = new ListModelListBoxEditor<>(new EnumRenderer());
@@ -464,6 +472,7 @@
         datacenterEditor.setTabIndex(nextTabIndex++);
         storageDomainEditor.setTabIndex(nextTabIndex++);
         volumeTypeEditor.setTabIndex(nextTabIndex++);
+        cinderVolumeTypeEditor.setTabIndex(nextTabIndex++);
         diskProfileEditor.setTabIndex(nextTabIndex++);
         quotaEditor.setTabIndex(nextTabIndex++);
         hostListEditor.setTabIndex(nextTabIndex++);
diff --git 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml
 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml
index 782ab67..15d791f 100644
--- 
a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml
+++ 
b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskPopupWidget.ui.xml
@@ -75,7 +75,8 @@
                                        <e:ListModelListBoxEditor 
ui:field="datacenterEditor" addStyleNames="{style.boxEditor}"/>
                                        <e:ListModelListBoxEditor 
ui:field="storageDomainEditor" addStyleNames="{style.boxEditor}"/>
                                        <e:ListModelListBoxEditor 
ui:field="volumeTypeEditor" addStyleNames="{style.boxEditor}"/>
-                                       <e:ListModelListBoxEditor 
ui:field="diskProfileEditor" addStyleNames="{style.boxEditor}"/>
+                                       <e:ListModelListBoxEditor 
ui:field="cinderVolumeTypeEditor" addStyleNames="{style.boxEditor}"/>
+                                       <e:ListModelListBoxEditor 
ui:field="diskProfileEditor" addStyleNames="{style.boxEditor}"/>
                                        <e:ListModelListBoxEditor 
ui:field="quotaEditor" addStyleNames="{style.boxEditor}"/>
                                        <e:ListModelListBoxEditor 
ui:field="hostListEditor" addStyleNames="{style.boxEditor}"/>
                                        <e:ListModelListBoxEditor 
ui:field="storageTypeEditor" addStyleNames="{style.boxEditor}"/>


-- 
To view, visit https://gerrit.ovirt.org/39049
To unsubscribe, visit https://gerrit.ovirt.org/settings

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

Reply via email to