rc/aircox
13
1
Fork 1
Code Issues 15 Pull Requests Projects Releases Wiki Activity

Compare commits

base: rc:f2c784f002e0dc2a52d35be01f68aa779f1a5a5c
Branches Tags
rc:develop-1.0
rc:master
...
compare: rc:065250db39043987ea50e48c3d6402738492d0ef
Branches Tags
rc:develop-1.0
rc:master

9 Commits
f2c784f002 ... 065250db39

Author SHA1 Message Date
Christophe Siraut
065250db39 (wip) in-site episode management for animators 2023-12-01 16:14:08 +01:00
Christophe Siraut
908fcd06b5 templates: set document type to html, prevent quicks mode 2023-12-01 15:32:58 +01:00
Christophe Siraut
5d51a67ac9 ProgramUpdateView: use ckeditor RichTextField 2023-12-01 15:32:58 +01:00
Christophe Siraut
20adbbacf1 context_processors: prevent a null station error when no default station is defined 2023-12-01 15:32:58 +01:00
Christophe Siraut
3c34ca88e2 views/program: allow changing program cover 2023-12-01 15:32:58 +01:00
Christophe Siraut
ff6577d013 misc: add a profile view for authenticated users 2023-12-01 15:32:58 +01:00
Christophe Siraut
f608592267 misc: use the django authentication system 2023-12-01 15:32:58 +01:00
Christophe Siraut
f3335116e2 misc: move station and audio_streams to context_processors (in order to have them available in accounts views) 2023-12-01 15:32:58 +01:00
Christophe Siraut
3759d54c2d misc: edit programs in site 2023-12-01 15:32:54 +01:00
18 changed files with 332 additions and 9 deletions
Show Stats Expand all files Collapse all files

4
aircox/context_processors/__init__.py Normal file
View File

@ -0,0 +1,4 @@
def station(request):
station = request.station
audio_streams = station.streams if station else None
return {"station": station, "audio_streams": audio_streams}

28
aircox/templates/accounts/profile.html Normal file
View File

@ -0,0 +1,28 @@
{% extends "aircox/base.html" %}
{% load i18n aircox %}
{% block head_title %}
{% block title %}{{ user.username }}{% endblock %}
{% endblock %}
{% block main %}
<h2 class="subtitle is-3">{% trans 'My programs' %}</h2>
{% if programs|length %}
<ul>
{% for p in programs %}
<li>• <a href="{% url 'program-detail' slug=p.slug %}">{{ p.title }}</a></li>
{% endfor %}
</ul>
<br />
<h2 class="subtitle is-3">{% trans 'Episodes' %}</h2>
{% for e in episodes %}
<ul>
<li>• <a href="{% url 'episode-detail' slug=e.slug %}">{{ e.title }}</a></li>
</ul>
{% endfor %}
{% else %}
{% trans 'You are not listed as a program editor yet' %}
{% endif %}
{% endblock %}

10
aircox/templates/aircox/base.html
View File

@ -1,3 +1,4 @@
{% load static i18n thumbnail aircox %}<!doctype html>
{% comment %} {% comment %}
Base website template. It displays various elements depending on context Base website template. It displays various elements depending on context
variables. variables.
@ -10,8 +11,6 @@ Usefull context:
- sidebar_url_name: url name sidebar item complete list - sidebar_url_name: url name sidebar item complete list
- sidebar_url_parent: parent page for sidebar items complete list - sidebar_url_parent: parent page for sidebar items complete list
{% endcomment %} {% endcomment %}
{% load static i18n thumbnail aircox %}
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
@ -68,6 +67,7 @@ Usefull context:
<div class="navbar-end"> <div class="navbar-end">
{% block top-nav-tools %} {% block top-nav-tools %}
{% endblock %} {% endblock %}
{% block top-nav-end %} {% block top-nav-end %}
<div class="navbar-item"> <div class="navbar-item">
<form action="{% url 'page-list' %}" method="GET"> <form action="{% url 'page-list' %}" method="GET">
@ -81,6 +81,12 @@ Usefull context:
</form> </form>
</div> </div>
{% endblock %} {% endblock %}
{% if user.is_authenticated %}
<div class="navbar-item">
<a href="{% url 'profile' %}">{{ user.username }}</a> &nbsp; <a href="{% url 'logout' %}"> <i class="fa fa-power-off"></i></a>
</div>
{% endif %}
</div> </div>
</div> </div>
</div> </div>

89
aircox/templates/aircox/program_detail.html Normal file
View File

@ -0,0 +1,89 @@
{% extends "aircox/basepage_detail.html" %}
{% load static i18n humanize honeypot aircox %}
{% comment %}
Base template used to display a Page
Context:
- page: page
- parent: parent page
{% endcomment %}
{% block header_crumbs %}
{{ block.super }}
{% if page.category %}
{% if parent %} / {% endif %} {{ page.category.title }}
{% endif %}
{% endblock %}
{% block top-nav-tools %}
{% has_perm page page.change_permission_codename simple=True as can_edit %}
{% if can_edit %}
<a class="navbar-item" href="{% url 'program-edit' page.pk %}" target="_self">
<span class="icon is-small">
<i class="fa fa-pen"></i>
</span>&nbsp;
<span>{% translate "Edit" %}</span>
</a>
{% endif %}
{% endblock %}
{% block main %}
{{ block.super }}
{% block comments %}
{% if comments or comment_form %}
<section class="mt-6">
<h4 class="title is-4">{% translate "Comments" %}</h4>
{% for comment in comments %}
<div class="media box">
<div class="media-content">
<p>
<strong class="mr-2">{{ comment.nickname }}</strong>
<time datetime="{{ comment.date }}" title="{{ comment.date }}">
<small>{{ comment.date|naturaltime }}</small>
</time>
<br>
{{ comment.content }}
</p>
</div>
</div>
{% endfor %}
{% if comment_form %}
<form method="POST">
<h5 class="title is-5">{% translate "Post a comment" %}</h5>
{% csrf_token %}
{% render_honeypot_field "website" %}
{% for field in comment_form %}
<div class="field is-horizontal">
<div class="field-label is-normal">
<label class="label">
{{ field.label_tag }}
</label>
</div>
<div class="field-body">
<div class="field">
<p class="control is-expanded">{{ field }}</p>
{% if field.errors %}
<p class="help is-danger">{{ field.errors }}</p>
{% endif %}
{% if field.help_text %}
<p class="help">{{ field.help_text|safe }}</p>
{% endif %}
</div>
</div>
</div>
{% endfor %}
<div class="has-text-right">
<button type="reset" class="button is-danger">{% translate "Reset" %}</button>
<button type="submit" class="button is-success">{% translate "Post comment" %}</button>
</div>
</form>
{% endif %}
</section>
{% endif %}
{% endblock %}
{% endblock %}

30
aircox/templates/aircox/program_form.html Normal file
View File

@ -0,0 +1,30 @@
{% extends "aircox/basepage_detail.html" %}
{% load static i18n humanize honeypot aircox %}
{% block head_extra %}
{{ form.media }}
{% endblock %}
{% block init-scripts %}
{% endblock %}
{% block top-nav-tools %}
<a class="navbar-item" href="{% url 'program-detail' object.slug %}" target="_self">
<span class="icon is-small">
<i class="fa fa-eye"></i>
</span>&nbsp;
<span>{% translate "View" %}</span>
</a>
{% endblock %}
{% block main %}
<form method="post" enctype="multipart/form-data">{% csrf_token %}
<table>
{{ form.as_table }}
{% render_honeypot_field "website" %}
</table>
<br/>
<input type="submit" value="Update" class="button is-success">
</form>
{% endblock %}

20
aircox/templates/registration/login.html Normal file
View File

@ -0,0 +1,20 @@
{% extends "aircox/base.html" %}
{% load i18n aircox %}
{% block main %}
<h2>{% trans "Log in" %}</h2>
<br/>
<form method="post" action="{% url 'login' %}">
{% csrf_token %}
<table>
{{ form.as_table }}
</table>
<br/>
<button type="submit">{% trans "Log in" %}</button>
<input type="hidden" name="next" value="{{ next }}">
</form>
{{ block.super }}
{% endblock %}

11
aircox/tests/test_permissions.py
View File

@ -1,5 +1,6 @@
import pytest import pytest
from django.contrib.auth.models import User, Group from django.contrib.auth.models import User, Group
from django.urls import reverse
@pytest.mark.django_db() @pytest.mark.django_db()
@ -23,3 +24,13 @@ def test_group_can_change_program(user, client, program):
user = User.objects.get(pk=user.pk) # reload user in order to have permissions set user = User.objects.get(pk=user.pk) # reload user in order to have permissions set
assert program.editors in user.groups.all() assert program.editors in user.groups.all()
assert user.has_perm("aircox.%s" % program.change_permission_codename) assert user.has_perm("aircox.%s" % program.change_permission_codename)
@pytest.mark.django_db()
def test_group_change_program(user, client, program):
client.force_login(user)
response = client.get(reverse("program-edit", kwargs={"pk": program.pk}))
assert response.status_code == 403
user.groups.add(program.editors)
response = client.get(reverse("program-edit", kwargs={"pk": program.pk}))
assert response.status_code == 200

22
aircox/tests/test_profile.py Normal file
View File

@ -0,0 +1,22 @@
import pytest
from django.urls import reverse
@pytest.mark.django_db()
def test_authenticate(user, client, program):
r = client.get(reverse("login"))
assert r.status_code == 200
assert b"id_username" in r.content
r = client.post(reverse("login"), kwargs={"username": "foo", "password": "bar"})
assert b"errorlist" in r.content
assert client.login(username="user1", password="bar")
@pytest.mark.django_db()
def test_profile_programs(user, client, program):
client.force_login(user)
r = client.get(reverse("profile"))
assert program.title not in r.content.decode("utf-8")
user.groups.add(program.editors)
r = client.get(reverse("profile"))
assert program.title in r.content.decode("utf-8")

40
aircox/tests/test_program.py Normal file
View File

@ -0,0 +1,40 @@
import pytest
from django.urls import reverse
from django.core.files.uploadedfile import SimpleUploadedFile
from aircox.models import Program
png_content = (
b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x01\x00\x00\x00\x01\x08\x02\x00\x00\x00\x90wS\xde"
+ b"\x00\x00\x00\x0cIDATx\x9cc`\xf8\xcf\x00\x00\x02\x02\x01\x00{\t\x81x\x00\x00\x00\x00IEND\xaeB`\x82"
)
@pytest.mark.django_db()
def test_edit_program(user, client, program):
client.force_login(user)
response = client.get(reverse("program-detail", kwargs={"slug": program.slug}))
assert response.status_code == 200
assert b"fa-pen" not in response.content
user.groups.add(program.editors)
response = client.get(reverse("program-detail", kwargs={"slug": program.slug}))
assert b"fa-pen" in response.content
assert b"foobar" not in response.content
response = client.post(reverse("program-edit", kwargs={"pk": program.pk}), {"content": "foobar"})
response = client.get(reverse("program-detail", kwargs={"slug": program.slug}))
assert b"foobar" in response.content
@pytest.mark.django_db()
def test_add_cover(user, client, program):
assert program.cover is None
user.groups.add(program.editors)
client.force_login(user)
cover = SimpleUploadedFile("cover1.png", png_content, content_type="image/png")
r = client.post(
reverse("program-edit", kwargs={"pk": program.pk}), {"content": "foobar", "new_cover": cover}, follow=True
)
assert r.status_code == 200
p = Program.objects.get(pk=program.pk)
assert "cover1.png" in p.cover.url

2
aircox/tests/views/test_base.py
View File

@ -54,13 +54,11 @@ class TestBaseView:
context = base_view.get_context_data() context = base_view.get_context_data()
assert context == { assert context == {
"view": base_view, "view": base_view,
"station": station,
"page": None, # get_page() returns None "page": None, # get_page() returns None
"has_sidebar": base_view.has_sidebar, "has_sidebar": base_view.has_sidebar,
"has_filters": False, "has_filters": False,
"sidebar_object_list": published_pages[: base_view.list_count], "sidebar_object_list": published_pages[: base_view.list_count],
"sidebar_list_url": base_view.get_sidebar_url(), "sidebar_list_url": base_view.get_sidebar_url(),
"audio_streams": station.streams,
"model": base_view.model, "model": base_view.model,
} }

7
aircox/urls.py
View File

@ -92,6 +92,11 @@ urls = [
views.ProgramDetailView.as_view(), views.ProgramDetailView.as_view(),
name="program-detail", name="program-detail",
), ),
path(
_("program/<pk>/edit/"),
views.ProgramUpdateView.as_view(),
name="program-edit",
),
path( path(
_("programs/<slug:parent_slug>/episodes/"), _("programs/<slug:parent_slug>/episodes/"),
views.EpisodeListView.as_view(), views.EpisodeListView.as_view(),
@ -112,4 +117,6 @@ urls = [
views.errors.NoStationErrorView.as_view(), views.errors.NoStationErrorView.as_view(),
name="errors-no-station", name="errors-no-station",
), ),
path("gestion/", views.profile, name="profile"),
path("accounts/profile/", views.profile, name="profile"),
] ]

4
aircox/views/__init__.py
View File

@ -11,11 +11,13 @@ from .page import (
PageDetailView, PageDetailView,
PageListView, PageListView,
) )
from .profile import profile
from .program import ( from .program import (
ProgramDetailView, ProgramDetailView,
ProgramListView, ProgramListView,
ProgramPageDetailView, ProgramPageDetailView,
ProgramPageListView, ProgramPageListView,
ProgramUpdateView,
) )
__all__ = ( __all__ = (
@ -35,8 +37,10 @@ __all__ = (
"BasePageListView", "BasePageListView",
"PageDetailView", "PageDetailView",
"PageListView", "PageListView",
"profile",
"ProgramDetailView", "ProgramDetailView",
"ProgramListView", "ProgramListView",
"ProgramPageDetailView", "ProgramPageDetailView",
"ProgramPageListView", "ProgramPageListView",
"ProgramUpdateView",
) )

4
aircox/views/base.py
View File

@ -33,7 +33,6 @@ class BaseView(TemplateResponseMixin, ContextMixin):
return None return None
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
kwargs.setdefault("station", self.station)
kwargs.setdefault("page", self.get_page()) kwargs.setdefault("page", self.get_page())
kwargs.setdefault("has_filters", self.has_filters) kwargs.setdefault("has_filters", self.has_filters)
@ -44,9 +43,6 @@ class BaseView(TemplateResponseMixin, ContextMixin):
kwargs["sidebar_object_list"] = sidebar_object_list[: self.list_count] kwargs["sidebar_object_list"] = sidebar_object_list[: self.list_count]
kwargs["sidebar_list_url"] = self.get_sidebar_url() kwargs["sidebar_list_url"] = self.get_sidebar_url()
if "audio_streams" not in kwargs:
kwargs["audio_streams"] = self.station.streams
if "model" not in kwargs: if "model" not in kwargs:
model = getattr(self, "model", None) or hasattr(self, "object") and type(self.object) model = getattr(self, "model", None) or hasattr(self, "object") and type(self.object)
kwargs["model"] = model kwargs["model"] = model

8
aircox/views/page.py
View File

@ -1,6 +1,7 @@
from django.http import Http404, HttpResponse from django.http import Http404, HttpResponse
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.views.generic import DetailView, ListView from django.views.generic import DetailView, ListView
from django.views.generic.edit import UpdateView
from honeypot.decorators import check_honeypot from honeypot.decorators import check_honeypot
from ..filters import PageFilters from ..filters import PageFilters
@ -138,3 +139,10 @@ class PageDetailView(BasePageDetailView):
comment.page = self.object comment.page = self.object
comment.save() comment.save()
return self.get(request, *args, **kwargs) return self.get(request, *args, **kwargs)
class PageUpdateView(BaseView, UpdateView):
context_object_name = "page"
def get_page(self):
return self.object

17
aircox/views/profile.py Normal file
View File

@ -0,0 +1,17 @@
from django.contrib.auth.decorators import login_required
from django.template.response import TemplateResponse
from aircox.models import Episode, Program
@login_required
def profile(request):
programs, episodes = [], []
ugroups = request.user.groups.all()
for p in Program.objects.all():
if p.editors in ugroups:
programs.append(p)
for e in Episode.objects.filter(parent=p):
episodes.append(e)
context = {"user": request.user, "programs": programs, "episodes": episodes}
return TemplateResponse(request, "accounts/profile.html", context)

41
aircox/views/program.py
View File

@ -1,8 +1,13 @@
from django.contrib.auth.mixins import UserPassesTestMixin
from django.forms import ModelForm, ImageField
from django.urls import reverse from django.urls import reverse
from ckeditor.fields import RichTextField
from filer.models.imagemodels import Image
from ..models import Page, Program, StaticPage from ..models import Page, Program, StaticPage
from .mixins import ParentMixin from .mixins import ParentMixin
from .page import PageDetailView, PageListView from .page import PageDetailView, PageListView, PageUpdateView
__all__ = ["ProgramPageDetailView", "ProgramDetailView", "ProgramPageListView"] __all__ = ["ProgramPageDetailView", "ProgramDetailView", "ProgramPageListView"]
@ -23,10 +28,44 @@ class BaseProgramMixin:
class ProgramDetailView(BaseProgramMixin, PageDetailView): class ProgramDetailView(BaseProgramMixin, PageDetailView):
model = Program model = Program
def get_template_names(self):
return super().get_template_names() + ["aircox/program_detail.html"]
def get_sidebar_queryset(self): def get_sidebar_queryset(self):
return super().get_sidebar_queryset().filter(parent=self.program) return super().get_sidebar_queryset().filter(parent=self.program)
class ProgramForm(ModelForm):
content = RichTextField()
new_cover = ImageField(required=False)
class Meta:
model = Program
fields = ["content"]
def save(self, commit=True):
file_obj = self.cleaned_data["new_cover"]
if file_obj:
obj, _ = Image.objects.get_or_create(original_filename=file_obj.name, file=file_obj)
self.instance.cover = obj
super().save(commit=commit)
class ProgramUpdateView(UserPassesTestMixin, BaseProgramMixin, PageUpdateView):
model = Program
form_class = ProgramForm
def get_sidebar_queryset(self):
return super().get_sidebar_queryset().filter(parent=self.program)
def test_func(self):
program = self.get_object()
return self.request.user.has_perm("aircox.%s" % program.change_permission_codename)
def get_success_url(self):
return reverse("program-detail", kwargs={"slug": self.get_object().slug})
class ProgramListView(PageListView): class ProgramListView(PageListView):
model = Program model = Program
attach_to_value = StaticPage.ATTACH_TO_PROGRAMS attach_to_value = StaticPage.ATTACH_TO_PROGRAMS

3
instance/settings/base.py
View File

@ -237,6 +237,7 @@ TEMPLATES = [
"django.template.context_processors.static", "django.template.context_processors.static",
"django.template.context_processors.tz", "django.template.context_processors.tz",
"django.contrib.messages.context_processors.messages", "django.contrib.messages.context_processors.messages",
"aircox.context_processors.station",
), ),
"loaders": ( "loaders": (
"django.template.loaders.filesystem.Loader", "django.template.loaders.filesystem.Loader",
@ -248,3 +249,5 @@ TEMPLATES = [
WSGI_APPLICATION = "instance.wsgi.application" WSGI_APPLICATION = "instance.wsgi.application"
LOGOUT_REDIRECT_URL = "/"

1
instance/urls.py
View File

@ -23,6 +23,7 @@ import aircox.urls
urlpatterns = aircox.urls.urls + [ urlpatterns = aircox.urls.urls + [
path("admin/", admin.site.urls), path("admin/", admin.site.urls),
path("accounts/", include("django.contrib.auth.urls")),
path("ckeditor/", include("ckeditor_uploader.urls")), path("ckeditor/", include("ckeditor_uploader.urls")),
path("filer/", include("filer.urls")), path("filer/", include("filer.urls")),
] ]