openstack/horizon
Code Issues Proposed changes

Merge "Description clean-up for volume actions"

Browse Source
This commit is contained in:
Jenkins 2014-09-09 16:01:22 +00:00 committed by Gerrit Code Review
commit 29f3782352
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_retype.html
View File

@ -17,7 +17,7 @@
<div class="right"> <div class="right">
<h3>{% trans "Description:" %}</h3> <h3>{% trans "Description:" %}</h3>
<p>{% blocktrans %} <p>{% blocktrans %}
From here you can change the volume type of a volume after its creation. Change the volume type of a volume after its creation.
This is equivalent to the <tt>cinder retype</tt> command. This is equivalent to the <tt>cinder retype</tt> command.
{% endblocktrans %} {% endblocktrans %}
</p> </p>

2
openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_upload_to_image.html
View File

@ -17,7 +17,7 @@
<div class="right"> <div class="right">
<h3>{% trans "Description:" %}</h3> <h3>{% trans "Description:" %}</h3>
<p>{% blocktrans %} <p>{% blocktrans %}
From here you can upload the volume to the Image Service as an image. Upload the volume to the Image Service as an image.
This is equivalent to the <tt>cinder upload-to-image</tt> command. This is equivalent to the <tt>cinder upload-to-image</tt> command.
{% endblocktrans %} {% endblocktrans %}
</p> </p>

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

@ -520,8 +520,7 @@ class UploadToImageForm(forms.SelfHandlingForm):
name = forms.CharField(label=_('Volume Name'), name = forms.CharField(label=_('Volume Name'),
widget=forms.TextInput( widget=forms.TextInput(
attrs={'readonly': 'readonly'})) attrs={'readonly': 'readonly'}))
image_name = forms.CharField(max_length="255", label=_('Image Name'), image_name = forms.CharField(max_length="255", label=_('Image Name'))
required=True)
disk_format = forms.ChoiceField(label=_('Disk Format'), disk_format = forms.ChoiceField(label=_('Disk Format'),
widget=forms.Select(), widget=forms.Select(),
required=False) required=False)
@ -617,8 +616,7 @@ class RetypeForm(forms.SelfHandlingForm):
name = forms.CharField(label=_('Volume Name'), name = forms.CharField(label=_('Volume Name'),
widget=forms.TextInput( widget=forms.TextInput(
attrs={'readonly': 'readonly'})) attrs={'readonly': 'readonly'}))
volume_type = forms.ChoiceField(label=_('Type'), volume_type = forms.ChoiceField(label=_('Type'))
required=True)
MIGRATION_POLICY_CHOICES = [('never', _('Never')), MIGRATION_POLICY_CHOICES = [('never', _('Never')),
('on-demand', _('On Demand'))] ('on-demand', _('On Demand'))]
migration_policy = forms.ChoiceField(label=_('Migration Policy'), migration_policy = forms.ChoiceField(label=_('Migration Policy'),