From f2ae573872e4d8ca6d9e009d1042ea1b4c659138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C4=93teris=20Caune?= <cuu508@gmail.com>
Date: Tue, 29 Jan 2019 16:54:51 +0200
Subject: [PATCH] Reduce the usage of request.project.

---
 hc/accounts/views.py                   | 3 ---
 hc/front/views.py                      | 2 --
 templates/base.html                    | 8 ++++----
 templates/front/my_checks_desktop.html | 2 +-
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/hc/accounts/views.py b/hc/accounts/views.py
index 49b74f4e..e99a8457 100644
--- a/hc/accounts/views.py
+++ b/hc/accounts/views.py
@@ -204,9 +204,6 @@ def profile(request):
                 profile.current_project = None
                 profile.save()
 
-            if request.project == project:
-                request.project = None
-
             Member.objects.filter(project=project, user=request.user).delete()
 
             ctx["left_project"] = project
diff --git a/hc/front/views.py b/hc/front/views.py
index 52e69e2a..ebb27ee3 100644
--- a/hc/front/views.py
+++ b/hc/front/views.py
@@ -102,7 +102,6 @@ def my_checks(request, code):
         request.profile.save()
 
     if request.profile.current_project_id != project.id:
-        request.project = project
         request.profile.current_project = project
         request.profile.save()
 
@@ -486,7 +485,6 @@ def status_single(request, code):
 
 
 @login_required
-# @project_required
 def channels(request):
     if request.method == "POST":
         code = request.POST["channel"]
diff --git a/templates/base.html b/templates/base.html
index e6f5493c..ef9dc09a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -89,9 +89,9 @@
         </div>
         <div id="navbar" class="navbar-collapse collapse">
             <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 %}>
-                        <a href="{% url 'hc-checks' request.project.code %}">Checks</a>
+                        <a href="{% url 'hc-checks' request.profile.current_project.code %}">Checks</a>
                     </li>
 
                     <li {% if page == 'channels' %} class="active" {% endif %}>
@@ -118,8 +118,8 @@
                     <a id="nav-email" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button">
                         {% if check %}
                             {{ check.project }}
-                        {% elif request.project %}
-                            {{ request.project }}
+                        {% elif request.profile.current_project %}
+                            {{ request.profile.current_project }}
                         {% else %}
                             {{ request.user.email }}
                         {% endif %}
diff --git a/templates/front/my_checks_desktop.html b/templates/front/my_checks_desktop.html
index e43883db..b792f1fc 100644
--- a/templates/front/my_checks_desktop.html
+++ b/templates/front/my_checks_desktop.html
@@ -2,7 +2,7 @@
 <table
     id="checks-table"
     class="table"
-    data-status-url="{% url 'hc-status' request.project.code %}">
+    data-status-url="{% url 'hc-status' project.code %}">
     <tr>
         <th></th>
         <th class="th-name">