diff options
| author | Sam Betts <sam@code-smash.net> | 2014-10-01 10:46:52 +0100 |
|---|---|---|
| committer | Sam Betts <sam@code-smash.net> | 2014-10-01 10:55:22 +0100 |
| commit | 3243486ef43191699d54da6cff4d244801a58944 (patch) | |
| tree | 8a2a97e8c2105a5471f66f986b5eb2bbd6c2b3e2 | |
| parent | 35487bf8a00ae8c0c445637443c7ee951a29fb10 (diff) | |
| download | horizon-3243486ef43191699d54da6cff4d244801a58944.tar.gz | |
Override Error Message in Create Subnet Workflow
The Admin->Networks->Create Subnet and Project->Networks->Create Subnet
both inherited their error message from the Project->Create Network
workflow, this patch moves the error message into a instance variable
that can be overridden by sub-classes, and overrides it in the Create
Subnet workflow.
Change-Id: I87e9b89b68560291e389a24be86f788167c5d149
Closes-Bug: 1375783
| -rw-r--r-- | openstack_dashboard/dashboards/project/networks/subnets/workflows.py | 1 | ||||
| -rw-r--r-- | openstack_dashboard/dashboards/project/networks/workflows.py | 6 |
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: |