openstack/horizon
Code Issues Proposed changes

Merge "Remove current QoS spec in volume type"

Browse Source
This commit is contained in:
Jenkins 2015-06-30 16:18:39 +00:00 committed by Gerrit Code Review
commit 9732709deb
1 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
openstack_dashboard/dashboards/admin/volumes/volume_types/forms.py
View File

@ -72,44 +72,22 @@ class ManageQosSpecAssociation(forms.SelfHandlingForm):
qos_spec_field.choices = \ qos_spec_field.choices = \
self.populate_qos_spec_choices() self.populate_qos_spec_choices()
# pre-select the current qos spec, if exists
# if no association exists, the selected entry will be "None"
# since it is index 0 of the choice box
current_qos_spec = self.initial["cur_qos_spec_id"]
if current_qos_spec:
qos_spec_field.initial = current_qos_spec
def populate_qos_spec_choices(self): def populate_qos_spec_choices(self):
# populate qos spec list box # populate qos spec list box
qos_specs = self.initial["qos_specs"] qos_specs = self.initial["qos_specs"]
current_qos_spec = self.initial["cur_qos_spec_id"]
qos_spec_list = [(qos_spec.id, qos_spec.name) qos_spec_list = [(qos_spec.id, qos_spec.name)
for qos_spec in qos_specs] for qos_spec in qos_specs
if qos_spec.id != current_qos_spec]
# 'none' is always listed first if current_qos_spec:
qos_spec_list.insert(0, ("-1", _("None"))) # used to remove the current spec
return qos_spec_list qos_spec_list.insert(0, ("-1", _("None (removes spec)")))
if qos_spec_list:
def clean_qos_spec_choice(self): qos_spec_list.insert(0, ("", _("Select a new QoS spec")))
# ensure that new association isn't the same as current association
cleaned_new_spec_id = self.cleaned_data.get('qos_spec_choice')
cur_spec_id = self.initial['cur_qos_spec_id']
found_error = False
if cur_spec_id:
# new = current
if cur_spec_id == cleaned_new_spec_id:
found_error = True
else: else:
# no current association qos_spec_list.insert(0, ("", _("No new QoS spec available")))
if cleaned_new_spec_id == '-1': return qos_spec_list
# new = current
found_error = True
if found_error:
raise forms.ValidationError(
_('New associated QoS Spec must be different than '
'the current associated QoS Spec.'))
return cleaned_new_spec_id
def handle(self, request, data): def handle(self, request, data):
vol_type_id = self.initial['type_id'] vol_type_id = self.initial['type_id']