openstack
/
horizon
Code Issues Proposed changes

remove read-only network ID field from Edit Network form 

Remove unnecessary field network_id from UpdateNetwork form.
Currently field is required to pass it to the
api.neutron.network_update method, but there is also
self.initial dict where the value can be get.

Closes-Bug: 1372348
Change-Id: I5cf9efa468d3f0a57d20e5ae54f74425d01ac606
This commit is contained in:
Wlodzimierz Borkowski 2014-09-30 16:47:44 +02:00
parent 4d688be57b
commit 696bd32fa0
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/dashboards/admin/networks/forms.py
View File

@ -230,9 +230,6 @@ class CreateNetwork(forms.SelfHandlingForm):
class UpdateNetwork(forms.SelfHandlingForm):
name = forms.CharField(label=_("Name"), required=False)
tenant_id = forms.CharField(widget=forms.HiddenInput)
network_id = forms.CharField(label=_("ID"),
widget=forms.TextInput(
attrs={'readonly': 'readonly'}))
# TODO(amotoki): make UP/DOWN translatable
admin_state = forms.ChoiceField(choices=[(True, 'UP'), (False, 'DOWN')],
label=_("Admin State"))
@ -246,7 +243,8 @@ class UpdateNetwork(forms.SelfHandlingForm):
'admin_state_up': (data['admin_state'] == 'True'),
'shared': data['shared'],
'router:external': data['external']}
network = api.neutron.network_update(request, data['network_id'],
network = api.neutron.network_update(request,
self.initial['network_id'],
**params)
msg = _('Network %s was successfully updated.') % data['name']
LOG.debug(msg)

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

@ -34,9 +34,6 @@ LOG = logging.getLogger(__name__)
class UpdateNetwork(forms.SelfHandlingForm):
name = forms.CharField(label=_("Name"), required=False)
tenant_id = forms.CharField(widget=forms.HiddenInput)
network_id = forms.CharField(label=_("ID"),
widget=forms.TextInput(
attrs={'readonly': 'readonly'}))
# TODO(amotoki): make UP/DOWN translatable
admin_state = forms.ChoiceField(choices=[(True, 'UP'), (False, 'DOWN')],
label=_("Admin State"))
@ -46,7 +43,8 @@ class UpdateNetwork(forms.SelfHandlingForm):
try:
params = {'admin_state_up': (data['admin_state'] == 'True'),
'name': data['name']}
network = api.neutron.network_update(request, data['network_id'],
network = api.neutron.network_update(request,
self.initial['network_id'],
**params)
msg = _('Network %s was successfully updated.') % data['name']
LOG.debug(msg)