From 89d23f11a3d6231ba62924732347cd17a2e90517 Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Tue, 13 Feb 2018 13:51:59 +0300
Subject: [PATCH 1/3] Fix user menu

---
 project/templates/lilcity/index.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html
index 9f6273b4..2737a719 100644
--- a/project/templates/lilcity/index.html
+++ b/project/templates/lilcity/index.html
@@ -135,14 +135,13 @@
           {% endif %}
           <div class="header__drop">
             {% comment %} <a class="header__link header__link_border" href="#">234.120.345 руб.</a> {% endcomment %}
-            {% with roles='author admin' %}
-            {% if request.user.role in roles.split and request.user.auth_token %}
-            {{request.user.auth_token}}
+            {% if request.user.auth_token %}
+            {% if request.user.role == 1 or request.user.role == 2 %}
             <a class="header__link header__link_green" href="#">
             {% else %}
             <a class="header__link header__link_gray disabled" href="#">
             {% endif %}
-            {% endwith %}
+            {% endif %}
               <div class="header__title">ДОБАВИТЬ КУРС</div>
             </a>
             <a class="header__link" href="{% url 'user' request.user.id %}">

From d9564b6fec064e75ab75bbe521e426b525212775 Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Tue, 13 Feb 2018 14:01:07 +0300
Subject: [PATCH 2/3] Fix create link and view

---
 apps/course/views.py                 | 8 ++++++--
 project/templates/lilcity/index.html | 2 +-
 project/urls.py                      | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/apps/course/views.py b/apps/course/views.py
index 1b79be28..80a5af8d 100644
--- a/apps/course/views.py
+++ b/apps/course/views.py
@@ -141,12 +141,16 @@ class CourseEditView(TemplateView):
     template_name = 'course/course_edit.html'
 
     def get(self, request, pk=None):
-        self.object = get_object_or_404(Course, pk=pk)
+        if pk:
+            self.object = get_object_or_404(Course, pk=pk)
+        else:
+            self.object = None
         return super().get(request)
 
     def get_context_data(self):
         context = super().get_context_data()
-        context['course'] = self.object
+        if self.object:
+            context['course'] = self.object
         return context
 
 
diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html
index 2737a719..c3b89cef 100644
--- a/project/templates/lilcity/index.html
+++ b/project/templates/lilcity/index.html
@@ -137,7 +137,7 @@
             {% comment %} <a class="header__link header__link_border" href="#">234.120.345 руб.</a> {% endcomment %}
             {% if request.user.auth_token %}
             {% if request.user.role == 1 or request.user.role == 2 %}
-            <a class="header__link header__link_green" href="#">
+            <a class="header__link header__link_green" href="{% url 'course_create' %}">
             {% else %}
             <a class="header__link header__link_gray disabled" href="#">
             {% endif %}
diff --git a/project/urls.py b/project/urls.py
index a0754311..9795639a 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -33,7 +33,8 @@ urlpatterns = [
     path('course/<int:pk>/', CourseView.as_view(), name='course'),
     path('course/<str:slug>/', CourseView.as_view(), name='course'),
     path('course/<int:course_id>/like', likes, name='likes'),
-    path('course/<int:pk>/edit', CourseEditView.as_view(), name='course-edit'),
+    path('course/create', CourseEditView.as_view(), name='course_create'),
+    path('course/<int:pk>/edit', CourseEditView.as_view(), name='course_edit'),
     path('course/<int:course_id>/comment', coursecomment, name='coursecomment'),
     path('lesson/<int:pk>/', LessonView.as_view(), name='lesson'),
     path('lesson/<int:lesson_id>/comment', lessoncomment, name='lessoncomment'),

From 9a84fb7c6f1b906978efdd8927869e110f0f0a1d Mon Sep 17 00:00:00 2001
From: Ivlev Denis <di-erz@yandex.ru>
Date: Tue, 13 Feb 2018 14:27:34 +0300
Subject: [PATCH 3/3] Dont show add course menu item if user not have perms

---
 project/templates/lilcity/index.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/project/templates/lilcity/index.html b/project/templates/lilcity/index.html
index c3b89cef..eddb7422 100644
--- a/project/templates/lilcity/index.html
+++ b/project/templates/lilcity/index.html
@@ -138,12 +138,11 @@
             {% if request.user.auth_token %}
             {% if request.user.role == 1 or request.user.role == 2 %}
             <a class="header__link header__link_green" href="{% url 'course_create' %}">
-            {% else %}
-            <a class="header__link header__link_gray disabled" href="#">
-            {% endif %}
-            {% endif %}
+            {% comment %} <a class="header__link header__link_gray disabled" href="#"> {% endcomment %}
               <div class="header__title">ДОБАВИТЬ КУРС</div>
             </a>
+            {% endif %}
+            {% endif %}
             <a class="header__link" href="{% url 'user' request.user.id %}">
               <div class="header__title">ПРОФИЛЬ</div>
             </a>