openstack/horizon
Code Issues Proposed changes

Merge "corrected the create volume from snapshot"

Browse Source
This commit is contained in:
Jenkins 2015-04-30 20:06:34 +00:00 committed by Gerrit Code Review
commit 49ceaa0649
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/dashboards/project/volumes/volumes/forms.py
View File

@ -319,7 +319,7 @@ class CreateForm(forms.SelfHandlingForm):
source_type = data.get('volume_source_type', None)
az = data.get('availability_zone', None) or None
if (data.get("snapshot_source", None) and
source_type in [None, 'snapshot_source']):
source_type in ['', None, 'snapshot_source']):
# Create from Snapshot
snapshot = self.get_snapshot(request,
data["snapshot_source"])
@ -331,7 +331,7 @@ class CreateForm(forms.SelfHandlingForm):
raise ValidationError(error_message)
az = None
elif (data.get("image_source", None) and
source_type in [None, 'image_source']):
source_type in ['', None, 'image_source']):
# Create from Snapshot
image = self.get_image(request,
data["image_source"])
@ -351,7 +351,7 @@ class CreateForm(forms.SelfHandlingForm):
% min_disk_size)
raise ValidationError(error_message)
elif (data.get("volume_source", None) and
source_type in [None, 'volume_source']):
source_type in ['', None, 'volume_source']):
# Create from volume
volume = self.get_volume(request, data["volume_source"])
volume_id = volume.id