openstack
/
sahara-dashboard
Code Issues Proposed changes

Merge "fix error redirecting of image-register"

This commit is contained in:
Jenkins 2016-11-28 15:30:51 +00:00 committed by Gerrit Code Review
parent 3d7ed540c5 bde2e5a577
commit 4737e0f40b
5 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara_dashboard/content/data_processing/clusters/image_registry/views.py
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

2
sahara_dashboard/content/data_processing/clusters/templates/cluster_wizard/cluster_guide.html
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>

2
sahara_dashboard/content/data_processing/clusters/templates/image_registry/_register_image.html
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 %}

3
sahara_dashboard/content/data_processing/clusters/urls.py
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'),

13
sahara_dashboard/content/data_processing/clusters/wizard/views.py
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(