forked from GithubBackups/healthchecks
Reduce the usage of request.project.
This commit is contained in:
parent
08810d1fca
commit
f2ae573872
@ -204,9 +204,6 @@ def profile(request):
|
|||||||
profile.current_project = None
|
profile.current_project = None
|
||||||
profile.save()
|
profile.save()
|
||||||
|
|
||||||
if request.project == project:
|
|
||||||
request.project = None
|
|
||||||
|
|
||||||
Member.objects.filter(project=project, user=request.user).delete()
|
Member.objects.filter(project=project, user=request.user).delete()
|
||||||
|
|
||||||
ctx["left_project"] = project
|
ctx["left_project"] = project
|
||||||
|
@ -102,7 +102,6 @@ def my_checks(request, code):
|
|||||||
request.profile.save()
|
request.profile.save()
|
||||||
|
|
||||||
if request.profile.current_project_id != project.id:
|
if request.profile.current_project_id != project.id:
|
||||||
request.project = project
|
|
||||||
request.profile.current_project = project
|
request.profile.current_project = project
|
||||||
request.profile.save()
|
request.profile.save()
|
||||||
|
|
||||||
@ -486,7 +485,6 @@ def status_single(request, code):
|
|||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
# @project_required
|
|
||||||
def channels(request):
|
def channels(request):
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
code = request.POST["channel"]
|
code = request.POST["channel"]
|
||||||
|
@ -89,9 +89,9 @@
|
|||||||
</div>
|
</div>
|
||||||
<div id="navbar" class="navbar-collapse collapse">
|
<div id="navbar" class="navbar-collapse collapse">
|
||||||
<ul id="nav-main-sections" class="nav navbar-nav">
|
<ul id="nav-main-sections" class="nav navbar-nav">
|
||||||
{% if request.user.is_authenticated and request.project %}
|
{% if request.user.is_authenticated and request.profile.current_project %}
|
||||||
<li {% if page == 'checks' %} class="active" {% endif %}>
|
<li {% if page == 'checks' %} class="active" {% endif %}>
|
||||||
<a href="{% url 'hc-checks' request.project.code %}">Checks</a>
|
<a href="{% url 'hc-checks' request.profile.current_project.code %}">Checks</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li {% if page == 'channels' %} class="active" {% endif %}>
|
<li {% if page == 'channels' %} class="active" {% endif %}>
|
||||||
@ -118,8 +118,8 @@
|
|||||||
<a id="nav-email" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button">
|
<a id="nav-email" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button">
|
||||||
{% if check %}
|
{% if check %}
|
||||||
{{ check.project }}
|
{{ check.project }}
|
||||||
{% elif request.project %}
|
{% elif request.profile.current_project %}
|
||||||
{{ request.project }}
|
{{ request.profile.current_project }}
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ request.user.email }}
|
{{ request.user.email }}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<table
|
<table
|
||||||
id="checks-table"
|
id="checks-table"
|
||||||
class="table"
|
class="table"
|
||||||
data-status-url="{% url 'hc-status' request.project.code %}">
|
data-status-url="{% url 'hc-status' project.code %}">
|
||||||
<tr>
|
<tr>
|
||||||
<th></th>
|
<th></th>
|
||||||
<th class="th-name">
|
<th class="th-name">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user