Merge "Pass page_url instead of whole request to render"
This commit is contained in:
commit
77955d5fce
|
@ -1,6 +1,5 @@
|
|||
{% load i18n %}
|
||||
|
||||
{% with page_url=request.horizon.panel.get_absolute_url %}
|
||||
<ul class="dropdown-menu">
|
||||
<li class="dropdown-header">{% trans "Projects:" %}</li>
|
||||
{% for project in projects %}
|
||||
|
@ -16,4 +15,3 @@
|
|||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endwith %}
|
||||
|
|
|
@ -1,11 +1,10 @@
|
|||
{% load i18n %}
|
||||
|
||||
{% with panel_url=request.horizon.panel.get_absolute_url %}
|
||||
<ul class="dropdown-menu">
|
||||
<li class="dropdown-header">{% trans "Regions:" %}</li>
|
||||
{% for region in regions %}
|
||||
<li>
|
||||
<a href="{% url 'switch_services_region' region %}?next={{ panel_url }}" target="_self">
|
||||
<a href="{% url 'switch_services_region' region %}?next={{ page_url }}" target="_self">
|
||||
<span class="region-name dropdown-title">{{ region }}</span>
|
||||
{% if region == region_name %}
|
||||
<span class="fa fa-check"></span>
|
||||
|
@ -14,4 +13,3 @@
|
|||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endwith %}
|
||||
|
|
|
@ -85,7 +85,7 @@ def show_project_list(context):
|
|||
key=lambda project: project.name.lower())
|
||||
context = {'projects': projects[:max_proj],
|
||||
'project_id': request.user.project_id,
|
||||
'request': request}
|
||||
'page_url': request.horizon.get('panel').get_absolute_url()}
|
||||
return context
|
||||
|
||||
|
||||
|
@ -98,7 +98,7 @@ def show_region_list(context):
|
|||
context = {'region_name': request.user.services_region,
|
||||
'regions': sorted(request.user.available_services_regions,
|
||||
key=lambda x: x.lower()),
|
||||
'request': request}
|
||||
'page_url': request.horizon.get('panel').get_absolute_url()}
|
||||
return context
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue