Merge branch 'dev' into 'master'

Fix perms

See merge request lilcity/backend!32
remotes/origin/hasaccess
cfwme 8 years ago
commit 20ae7fd1a0
  1. 11
      apps/course/templates/course/course.html
  2. 11
      apps/course/templates/course/course_only_lessons.html

@ -147,6 +147,13 @@
{% if not user.is_authenticated %}data-popup=".js-popup-auth"{% endif %}
>УРОКИ
</a>
{% elif request.user.role == request.user.ADMIN_ROLE %}
<a
href="{% url 'course-only-lessons' course.id %}"
class="course__action btn btn_lg{% if only_lessons %} btn_stroke{% else %} btn_gray{% endif %}"
{% if not user.is_authenticated %}data-popup=".js-popup-auth"{% endif %}
>УРОКИ
</a>
{% else %}
<a
class="course__action btn btn_lg{% if only_lessons %} btn_stroke{% else %} btn_gray{% endif %}"
@ -225,6 +232,8 @@
{% for lesson in course.lessons.all %}
{% if course.author == request.user and request.user.role >= request.user.AUTHOR_ROLE %}
<a href="{% url 'lesson' pk=lesson.id %}?next={{ request.get_full_path }}">
{% elif request.user.role == request.user.ADMIN_ROLE %}
<a href="{% url 'lesson' pk=lesson.id %}?next={{ request.get_full_path }}">
{% else %}
<div>
{% endif %}
@ -236,6 +245,8 @@
</div>
{% if course.author == request.user and request.user.role >= request.user.AUTHOR_ROLE %}
</a>
{% elif request.user.role == request.user.ADMIN_ROLE %}
</a>
{% else %}
</div>
{% endif %}

@ -144,6 +144,13 @@
{% if not user.is_authenticated %}data-popup=".js-popup-auth"{% endif %}
>УРОКИ
</a>
{% elif request.user.role == request.user.ADMIN_ROLE %}
<a
href="{% url 'course-only-lessons' course.id %}"
class="course__action btn btn_lg{% if only_lessons %} btn_stroke{% else %} btn_gray{% endif %}"
{% if not user.is_authenticated %}data-popup=".js-popup-auth"{% endif %}
>УРОКИ
</a>
{% else %}
<a
href="{% if paid %}{% url 'course-only-lessons' course.id %}{% else %}#{% endif %}"
@ -166,7 +173,11 @@
<div class="lessons__title title">Содержание курса</div>
<div class="lessons__list">
{% for lesson in course.lessons.all %}
{% if request.user.role == request.user.ADMIN_ROLE %}
<a href="{% url 'lesson' pk=lesson.id %}">
{% else %}
<a href="{% if course.author == request.user and request.user.role >= request.user.AUTHOR_ROLE %}{% url 'lesson' pk=lesson.id %}{% else %}#{% endif %}">
{% endif %}
<div class="lessons__item">
<div class="lessons__subtitle subtitle">{{ lesson.title }}</div>
<div class="lessons__row">

Loading…
Cancel
Save