Merge branch 'dev' of gitlab.com:lilcity/backend into feature/create-edit-courses

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
 
 

project/templates/lilcity/index.html

@@ -135,16 +135,14 @@
           {% 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}}
-            <a class="header__link header__link_green" href="#">
-            {% else %}
-            <a class="header__link header__link_gray disabled" href="#">
-            {% endif %}
-            {% endwith %}
+            {% 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' %}">
+            {% 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>

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'),