summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-02 11:52:32 +0000
committerGerrit Code Review <review@openstack.org>2014-10-02 11:52:32 +0000
commita8bfe3c854c40ad0f655ddf9b270ff6b373eb4ae (patch)
tree076c4edb4fec3bddc8c789ff9e99334360e7c21e
parent060d80ded98911a12c1be9eae534630c4f182851 (diff)
parent3243486ef43191699d54da6cff4d244801a58944 (diff)
downloadhorizon-a8bfe3c854c40ad0f655ddf9b270ff6b373eb4ae.tar.gz
Merge "Override Error Message in Create Subnet Workflow"
-rw-r--r--openstack_dashboard/dashboards/project/networks/subnets/workflows.py1
-rw-r--r--openstack_dashboard/dashboards/project/networks/workflows.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/openstack_dashboard/dashboards/project/networks/subnets/workflows.py b/openstack_dashboard/dashboards/project/networks/subnets/workflows.py
index c3ed96bfb..4c381fbd1 100644
--- a/openstack_dashboard/dashboards/project/networks/subnets/workflows.py
+++ b/openstack_dashboard/dashboards/project/networks/subnets/workflows.py
@@ -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")
diff --git a/openstack_dashboard/dashboards/project/networks/workflows.py b/openstack_dashboard/dashboards/project/networks/workflows.py
index 3efa96653..a2fa53d0b 100644
--- a/openstack_dashboard/dashboards/project/networks/workflows.py
+++ b/openstack_dashboard/dashboards/project/networks/workflows.py
@@ -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: