Fix perms for LiveLessonsView & LiveLessonEditView

remotes/origin/hasaccess
Ivlev Denis 8 years ago
parent 79f46e85bc
commit 548cc16ee3
  1. 142
      apps/school/templates/school/lesson.html
  2. 13
      apps/school/views.py

@ -0,0 +1,142 @@
{% extends "templates/lilcity/index.html" %}
{% load static %}
{% block title %}{{ lesson.title }} - {{ block.super }}{% endblock title %}
{% block content %}
<div class="section" style="margin-bottom:0;padding-bottom:0">
<div class="section__center center center_sm">
<div class="go">
<a class="go__item" href="{% if next %}{{next}}{% else %}{% url 'course' lesson.course.id %}{% endif %}">
<div class="go__arrow">
<svg class="icon icon-arrow-left">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-left"></use>
</svg>
</div>
<div class="go__title">Вернуться к&nbsp;списку уроков</div>
</a>
{% comment %} {% if next_lesson %}
<a class="go__item" href="{{ next_lesson }}">
<div class="go__title">Перейти к&nbsp;следующему уроку</div>
<div class="go__arrow">
<svg class="icon icon-arrow-right">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-right"></use>
</svg>
</div>
</a>
{% endif %} {% endcomment %}
</div>
<div class="lesson">
<div class="lesson__subtitle subtitle">{{ lesson.title }}</div>
<div class="lesson__content">{{ lesson.short_description }}</div>
{% comment %} <a class="lesson__video video" href="#">
{% if lesson.cover %}
<img class="video__pic" src="{{ lesson.cover.image.url }}"/>
{% else %}
<img class="video__pic" src="{% static 'img/no_cover.png' %}"/>
{% endif %}
<svg class="icon icon-play">
<use xlink:href="{% static 'img/sprite.svg' %}#icon-play"></use>
</svg>
</a> {% endcomment %}
</div>
</div>
</div>
{% for content in lesson.content.all %}
{% with template="course/content/"|add:content.ctype|add:".html" %}
{% include template %}
{% endwith %}
{% endfor %}
{% comment %} <div class="section section_gradient">
<div class="section__center center center_sm">
<div class="title">Примеры техники</div>
<div class="examples">
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
<div class="examples__item">
<img class="examples__pic" src="{% static 'img/box.jpg' %}">
</div>
</div>
</div>
</div> {% endcomment %}
<div class="section section_gray">
<div class="section__center center center_sm">
<div class="title">Задавайте вопросы:</div>
<div class="questions">
{% if request.user.is_authenticated %}
<form class="questions__form" method="post" action="{% url 'lessoncomment' lesson_id=lesson.id %}">
<div class="questions__ava ava">
<img
class="ava__pic"
{% if request.user.photo %}
src="{{ request.user.photo.url }}"
{% else %}
src="{% static 'img/user.jpg' %}"
{% endif %}
>
</div>
<div class="questions__wrap">
<div class="questions__field">
<textarea class="questions__textarea" placeholder="Спросите автора курса интересующие вас вопросы"></textarea>
</div>
<button class="questions__btn btn btn_light">ОТПРАВИТЬ</button>
</div>
</form>
{% else %}
<div>Только зарегистрированные пользователи могут оставлять комментарии.</div>
{% endif %}
<div class="questions__list">
{% include "./blocks/comments.html" with object=lesson %}
</div>
</div>
</div>
</div>
<div class="section">
<div class="section__center center center_sm">
<div class="share">
<div class="share__title">Поделиться уроком</div>
<div class="share__list">
<div class="likely">
<div class="facebook">Facebook</div>
<div class="twitter">Twitter</div>
<div class="gplus">Google+</div>
<div class="vkontakte">VK</div>
<div class="pinterest">Pinterest</div>
</div>
</div>
</div>
</div>
</div>
{% endblock content %}

@ -1,4 +1,6 @@
from django.contrib.auth.decorators import login_required
from django.shortcuts import get_object_or_404
from django.utils.decorators import method_decorator
from django.views.generic import ListView, UpdateView, TemplateView
from .models import LiveLesson
@ -8,18 +10,23 @@ class LiveLessonsView(ListView):
model = LiveLesson
template_name = 'school/livelessons_list.html'
def get(self, request, pk=None):
if request.user.role not in [User.ADMIN_ROLE, User.TEACHER_ROLE]:
raise Http404
return super().get(request)
# @method_decorator(login_required, name='dispatch')
@method_decorator(login_required, name='dispatch')
class LiveLessonEditView(TemplateView):
template_name = 'course/course_edit.html'
def get(self, request, pk=None):
if request.user.role not in [User.ADMIN_ROLE, User.TEACHER_ROLE]:
raise Http404
if pk:
self.object = get_object_or_404(LiveLesson, pk=pk)
else:
self.object = LiveLesson.objects.create()
# if request.user != self.object.author and request.user.role not in [User.ADMIN_ROLE, User.AUTHOR_ROLE]:
# raise Http404
return super().get(request)
def get_context_data(self):

Loading…
Cancel
Save