openstack
/
horizon
Code Issues Proposed changes

Merge "Override Error Message in Create Subnet Workflow"

This commit is contained in:
Jenkins 2014-10-02 11:52:32 +00:00 committed by Gerrit Code Review
parent 060d80ded9 3243486ef4
commit a8bfe3c854
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack_dashboard/dashboards/project/networks/subnets/workflows.py
View File

@ -32,6 +32,7 @@ LOG = logging.getLogger(__name__)
class CreateSubnetInfoAction(network_workflows.CreateSubnetInfoAction):
with_subnet = forms.BooleanField(initial=True, required=False,
widget=forms.HiddenInput())
msg = _('Specify "Network Address"')
class Meta:
name = _("Subnet")

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

@ -121,6 +121,8 @@ class CreateSubnetInfoAction(workflows.Action):
mask=False)
no_gateway = forms.BooleanField(label=_("Disable Gateway"),
initial=False, required=False)
msg = _('Specify "Network Address" or '
'clear "Create Subnet" checkbox.')
class Meta:
name = _("Subnet")
@ -143,9 +145,7 @@ class CreateSubnetInfoAction(workflows.Action):
gateway_ip = cleaned_data.get('gateway_ip')
no_gateway = cleaned_data.get('no_gateway')
if not cidr:
msg = _('Specify "Network Address" or '
'clear "Create Subnet" checkbox.')
raise forms.ValidationError(msg)
raise forms.ValidationError(self.msg)
if cidr:
subnet = netaddr.IPNetwork(cidr)
if subnet.version != ip_version: