fix error redirecting of image-register

After submitting the "image-register" form in cluster-guide page, page
redirects to the index page other than staying in cluster-guide page.
This patch fixes related issue. Now it will return to cluster-guide
page after registering image.

Closes-Bug: 1636880
Change-Id: I6a74e621a688f1021e14f888b1150a46119874a7
This commit is contained in:
yingya.shu@easystack.cn 2016-10-26 16:09:34 +08:00 committed by Shu Yingya
parent b8d1f8e5fd
commit bde2e5a577
5 changed files with 20 additions and 2 deletions

View File

@ -95,6 +95,8 @@ class RegisterImageView(forms.ModalFormView):
def get_context_data(self, **kwargs):
context = super(RegisterImageView, self).get_context_data(**kwargs)
context['action_url'] = ('horizon:project'
':data_processing.clusters:register')
update_context_with_plugin_tags(self.request, context)
return context

View File

@ -47,7 +47,7 @@
</div>
<div>
<a class="btn btn-default btn-small btn-create btn-inline ajax-modal"
href="{% url 'horizon:project:data_processing.clusters:register'%}">
href="{% url 'horizon:project:data_processing.clusters:image_register'%}">
<span class="fa fa-plus"></span> {% trans "Register Image" %}</a>
</div>
</div>

View File

@ -4,7 +4,7 @@
{% load i18n %}
{% block form_id %}register_image_form{% endblock %}
{% block form_action %}{% url 'horizon:project:data_processing.clusters:register' %}{% endblock %}
{% block form_action %}{% url action_url %}{% endblock %}
{% block modal-header %}{% trans "Register Image" %}{% endblock %}

View File

@ -91,6 +91,9 @@ urlpatterns = [url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^cluster_guide/(?P<reset_cluster_guide>[^/]+)/$',
cluster_guide_views.ResetClusterGuideView.as_view(),
name='reset_cluster_guide'),
url(r'^image_register/$',
cluster_guide_views.ImageRegisterView.as_view(),
name='image_register'),
url(r'^plugin_select$',
cluster_guide_views.PluginSelectView.as_view(),
name='plugin_select'),

View File

@ -22,6 +22,8 @@ from horizon import views as horizon_views
from sahara_dashboard.api import sahara as saharaclient
from sahara_dashboard.content.data_processing.utils \
import helpers
import sahara_dashboard.content. \
data_processing.clusters.image_registry.views as imgviews
import sahara_dashboard.content.data_processing.clusters.wizard \
.forms as wizforms
@ -54,6 +56,17 @@ class ResetClusterGuideView(generic.RedirectView):
return http.HttpResponseRedirect(reverse_lazy(self.pattern_name))
class ImageRegisterView(imgviews.RegisterImageView):
success_url = reverse_lazy(
'horizon:project:data_processing.clusters:cluster_guide')
def get_context_data(self, **kwargs):
context = super(ImageRegisterView, self).get_context_data(**kwargs)
context['action_url'] = ('horizon:project'
':data_processing.clusters:image_register')
return context
class PluginSelectView(forms.ModalFormView):
form_class = wizforms.ChoosePluginForm
success_url = reverse_lazy(