Merge "Size(GiB) - fix for forgotten space"
This commit is contained in:
@@ -147,11 +147,11 @@ class CreatePolicyForm(forms.SelfHandlingForm):
|
||||
return rbac_policy
|
||||
except neutron_exc.OverQuotaClient:
|
||||
redirect = reverse('horizon:admin:rbac_policies:index')
|
||||
msg = _('rbac policy quota exceeded.')
|
||||
msg = _('RBAC Policy quota exceeded.')
|
||||
exceptions.handle(request, msg, redirect=redirect)
|
||||
except Exception:
|
||||
redirect = reverse('horizon:admin:rbac_policies:index')
|
||||
msg = _('Failed to create a rbac policy.')
|
||||
msg = _('Failed to create a RBAC Policy.')
|
||||
exceptions.handle(request, msg, redirect=redirect)
|
||||
return False
|
||||
|
||||
@@ -179,9 +179,9 @@ class UpdatePolicyForm(forms.SelfHandlingForm):
|
||||
messages.success(request, msg)
|
||||
return rbac_policy
|
||||
except Exception as e:
|
||||
LOG.info('Failed to update rbac policy %(id)s: %(exc)s',
|
||||
LOG.info('Failed to update RBAC Policy %(id)s: %(exc)s',
|
||||
{'id': self.initial['rbac_policy_id'], 'exc': e})
|
||||
msg = _('Failed to update rbac policy %s') \
|
||||
msg = _('Failed to update RBAC Policy %s') \
|
||||
% self.initial['rbac_policy_id']
|
||||
redirect = reverse(self.failure_url)
|
||||
exceptions.handle(request, msg, redirect=redirect)
|
||||
|
@@ -38,7 +38,7 @@ class OverviewTab(tabs.Tab):
|
||||
rbac_policy_id)
|
||||
|
||||
except Exception:
|
||||
msg = _('Unable to retrieve details for rbac_policy "%s".') \
|
||||
msg = _('Unable to retrieve details for RBAC Policy "%s".') \
|
||||
% (rbac_policy_id)
|
||||
exceptions.handle(self.request, msg)
|
||||
return rbac_policy
|
||||
|
@@ -3,5 +3,5 @@
|
||||
|
||||
{% block modal-body-right %}
|
||||
<h3>{% trans "Description:" %}</h3>
|
||||
<p>{% trans "From here you can create a rbac policy." %}</p>
|
||||
<p>{% trans "From here you can create a RBAC Policy." %}</p>
|
||||
{% endblock %}
|
||||
|
@@ -129,7 +129,7 @@ class UpdateView(forms.ModalFormView):
|
||||
return api.neutron.rbac_policy_get(self.request, rbac_policy_id)
|
||||
except Exception:
|
||||
redirect = self.success_url
|
||||
msg = _('Unable to retrieve rbac policy details.')
|
||||
msg = _('Unable to retrieve RBAC Policy details.')
|
||||
exceptions.handle(self.request, msg, redirect=redirect)
|
||||
|
||||
def get_initial(self):
|
||||
|
Reference in New Issue
Block a user