openstack
/
horizon
Code Issues Proposed changes

Correct wrong cancel action url in Extra Specs page 

In the Volume Type Extra Specs page, in create and edit Volume Type
Extra Spec modal dialog the cancel action redirect to wrong url,
when right click the cancel button, it will cast error. In the
QoS Spec page, there has the same error. This patch fix them.

Change-Id: If705635b2f89e78eeec34d8f99d7317e2c88ce59
Closes-Bug: #1490375
This commit is contained in:
chenqiaomin 2015-07-08 14:51:41 -04:00
parent 69d6d50ef4
commit cc37b8fd64
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/admin/volumes/volume_types/extras/views.py
View File

@ -11,6 +11,7 @@
# under the License.
from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
@ -65,6 +66,7 @@ class CreateView(ExtraSpecMixin, forms.ModalFormView):
submit_url = "horizon:admin:volumes:volume_types:extras:create"
template_name = 'admin/volumes/volume_types/extras/create.html'
success_url = 'horizon:admin:volumes:volume_types:extras:index'
cancel_url = reverse_lazy('horizon:admin:volumes:volume_types_tab')
def get_initial(self):
return {'type_id': self.kwargs['type_id']}
@ -89,6 +91,7 @@ class EditView(ExtraSpecMixin, forms.ModalFormView):
submit_url = "horizon:admin:volumes:volume_types:extras:edit"
template_name = 'admin/volumes/volume_types/extras/edit.html'
success_url = 'horizon:admin:volumes:volume_types:extras:index'
cancel_url = reverse_lazy('horizon:admin:volumes:volume_types_tab')
def get_success_url(self):
return reverse(self.success_url,

11
openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/views.py
View File

@ -75,7 +75,7 @@ class CreateKeyValuePairView(QosSpecMixin, forms.ModalFormView):
template_name = 'admin/volumes/volume_types/qos_specs/create.html'
submit_label = _("Create")
submit_url = "horizon:admin:volumes:volume_types:qos_specs:create"
success_url = 'horizon:admin:volumes:volume_types:qos_specs:index'
url = 'horizon:admin:volumes:volume_types:qos_specs:index'
page_title = _("Spec: {{ qos_spec_name }}")
def get_initial(self):
@ -83,7 +83,7 @@ class CreateKeyValuePairView(QosSpecMixin, forms.ModalFormView):
return {'qos_spec_id': qos_spec_id}
def get_success_url(self):
return reverse(self.success_url,
return reverse(self.url,
args=(self.kwargs['qos_spec_id'],))
def get_context_data(self, **kwargs):
@ -91,6 +91,7 @@ class CreateKeyValuePairView(QosSpecMixin, forms.ModalFormView):
get_context_data(**kwargs)
args = (self.kwargs['qos_spec_id'],)
context['submit_url'] = reverse(self.submit_url, args=args)
context['cancel_url'] = reverse(self.url, args=args)
return context
@ -102,11 +103,11 @@ class EditKeyValuePairView(QosSpecMixin, forms.ModalFormView):
template_name = 'admin/volumes/volume_types/qos_specs/edit.html'
submit_label = _("Save")
submit_url = "horizon:admin:volumes:volume_types:qos_specs:edit"
success_url = 'horizon:admin:volumes:volume_types:qos_specs:index'
url = 'horizon:admin:volumes:volume_types:qos_specs:index'
page_title = _("QoS Spec: {{ qos_spec_name }}")
def get_success_url(self):
return reverse(self.success_url,
return reverse(self.url,
args=(self.kwargs['qos_spec_id'],))
def get_initial(self):
@ -127,4 +128,6 @@ class EditKeyValuePairView(QosSpecMixin, forms.ModalFormView):
context = super(EditKeyValuePairView, self).get_context_data(**kwargs)
args = (self.kwargs['qos_spec_id'], self.kwargs['key'],)
context['submit_url'] = reverse(self.submit_url, args=args)
context['cancel_url'] = reverse(self.url,
args=(self.kwargs['qos_spec_id'],))
return context