mirror of
https://github.com/ae-utbm/sith.git
synced 2025-09-14 12:05:44 +00:00
Compare commits
12 Commits
master
...
auto-archi
Author | SHA1 | Date | |
---|---|---|---|
|
5274f1f0f0 | ||
|
b767079c5a | ||
|
37961e437b | ||
|
b97a1a2e56 | ||
|
fdf5e4fbe9 | ||
|
4e08591721 | ||
|
27b98f4a48 | ||
|
cb454935ad | ||
|
17c50934bb | ||
|
5646f22968 | ||
|
03759fd83e | ||
|
83c96884d8 |
@@ -1,6 +1,14 @@
|
||||
{% extends "core/base.jinja" %}
|
||||
{% from 'core/macros.jinja' import user_profile_link %}
|
||||
|
||||
{% block title -%}
|
||||
{{ club.name }}
|
||||
{%- endblock %}
|
||||
|
||||
{% block description -%}
|
||||
{{ club.short_description }}
|
||||
{%- endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div id="club_detail">
|
||||
{% if club.logo %}
|
||||
|
@@ -1,8 +1,12 @@
|
||||
{% extends "core/base.jinja" %}
|
||||
|
||||
{% block title %}
|
||||
{% block title -%}
|
||||
{% trans %}Club list{% endtrans %}
|
||||
{% endblock %}
|
||||
{%- endblock %}
|
||||
|
||||
{% block description -%}
|
||||
{% trans %}The list of all clubs existing at UTBM.{% endtrans %}
|
||||
{%- endblock %}
|
||||
|
||||
{% macro display_club(club) -%}
|
||||
|
||||
@@ -21,7 +25,7 @@
|
||||
|
||||
{%- if club.children.all()|length != 0 %}
|
||||
<ul>
|
||||
{%- for c in club.children.order_by('name') %}
|
||||
{%- for c in club.children.order_by('name').prefetch_related("children") %}
|
||||
{{ display_club(c) }}
|
||||
{%- endfor %}
|
||||
</ul>
|
||||
@@ -36,8 +40,8 @@
|
||||
{% if club_list %}
|
||||
<h3>{% trans %}Club list{% endtrans %}</h3>
|
||||
<ul>
|
||||
{%- for c in club_list.all().order_by('name') if c.parent is none %}
|
||||
{{ display_club(c) }}
|
||||
{%- for club in club_list %}
|
||||
{{ display_club(club) }}
|
||||
{%- endfor %}
|
||||
</ul>
|
||||
{% else %}
|
||||
|
@@ -171,6 +171,10 @@ class ClubListView(ListView):
|
||||
|
||||
model = Club
|
||||
template_name = "club/club_list.jinja"
|
||||
queryset = (
|
||||
Club.objects.filter(parent=None).order_by("name").prefetch_related("children")
|
||||
)
|
||||
context_object_name = "club_list"
|
||||
|
||||
|
||||
class ClubView(ClubTabsMixin, DetailView):
|
||||
|
@@ -68,7 +68,7 @@ class IcsCalendar:
|
||||
start=news_date.start_date,
|
||||
end=news_date.end_date,
|
||||
url=as_absolute_url(
|
||||
reverse("com:news_detail", kwargs={"news_id": news_date.news.id})
|
||||
reverse("com:news_detail", kwargs={"news_id": news_date.news_id})
|
||||
),
|
||||
)
|
||||
calendar.events.append(event)
|
||||
|
@@ -27,7 +27,7 @@ from django.conf import settings
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.mail import EmailMultiAlternatives
|
||||
from django.db import models, transaction
|
||||
from django.db.models import F, Q
|
||||
from django.db.models import Exists, F, OuterRef, Q
|
||||
from django.shortcuts import render
|
||||
from django.templatetags.static import static
|
||||
from django.urls import reverse
|
||||
@@ -55,9 +55,17 @@ class Sith(models.Model):
|
||||
|
||||
|
||||
class NewsQuerySet(models.QuerySet):
|
||||
def moderated(self) -> Self:
|
||||
def published(self) -> Self:
|
||||
return self.filter(is_published=True)
|
||||
|
||||
def waiting_moderation(self) -> Self:
|
||||
"""Filter all non-finished non-published news"""
|
||||
# Because of the way News and NewsDates are created,
|
||||
# there may be some cases where this method is called before
|
||||
# the NewsDates linked to a Date are actually persisted in db.
|
||||
# Thus, it's important to filter by "not past date" rather than by "future date"
|
||||
return self.filter(~Q(dates__start_date__lt=timezone.now()), is_published=False)
|
||||
|
||||
def viewable_by(self, user: User) -> Self:
|
||||
"""Filter news that the given user can view.
|
||||
|
||||
@@ -127,20 +135,28 @@ class News(models.Model):
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
super().save(*args, **kwargs)
|
||||
if self.is_published:
|
||||
return
|
||||
for user in User.objects.filter(
|
||||
groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID]
|
||||
):
|
||||
Notification.objects.create(
|
||||
user=user, url=reverse("com:news_admin_list"), type="NEWS_MODERATION"
|
||||
if not self.is_published:
|
||||
admins_without_notif = User.objects.filter(
|
||||
~Exists(
|
||||
Notification.objects.filter(
|
||||
user=OuterRef("pk"), type="NEWS_MODERATION"
|
||||
)
|
||||
),
|
||||
groups__id=settings.SITH_GROUP_COM_ADMIN_ID,
|
||||
)
|
||||
notif_url = reverse("com:news_admin_list")
|
||||
new_notifs = [
|
||||
Notification(user=user, url=notif_url, type="NEWS_MODERATION")
|
||||
for user in admins_without_notif
|
||||
]
|
||||
Notification.objects.bulk_create(new_notifs)
|
||||
self.update_moderation_notifs()
|
||||
|
||||
def get_absolute_url(self):
|
||||
return reverse("com:news_detail", kwargs={"news_id": self.id})
|
||||
|
||||
def get_full_url(self):
|
||||
return "https://%s%s" % (settings.SITH_URL, self.get_absolute_url())
|
||||
return f"https://{settings.SITH_URL}{self.get_absolute_url()}"
|
||||
|
||||
def is_owned_by(self, user):
|
||||
if user.is_anonymous:
|
||||
@@ -159,19 +175,16 @@ class News(models.Model):
|
||||
or (user.is_authenticated and self.author_id == user.id)
|
||||
)
|
||||
|
||||
|
||||
def news_notification_callback(notif: Notification):
|
||||
# the NewsDate linked to the News
|
||||
# which creation triggered this callback may not exist yet,
|
||||
# so it's important to filter by "not past date" rather than by "future date"
|
||||
count = News.objects.filter(
|
||||
~Q(dates__start_date__gt=timezone.now()), is_published=False
|
||||
).count()
|
||||
if count:
|
||||
notif.viewed = False
|
||||
notif.param = str(count)
|
||||
else:
|
||||
notif.viewed = True
|
||||
@staticmethod
|
||||
def update_moderation_notifs():
|
||||
count = News.objects.waiting_moderation().count()
|
||||
notifs_qs = Notification.objects.filter(
|
||||
type="NEWS_MODERATION", user__groups__id=settings.SITH_GROUP_COM_ADMIN_ID
|
||||
)
|
||||
if count:
|
||||
notifs_qs.update(viewed=False, param=str(count))
|
||||
else:
|
||||
notifs_qs.update(viewed=True)
|
||||
|
||||
|
||||
class NewsDateQuerySet(models.QuerySet):
|
||||
|
@@ -1,10 +1,6 @@
|
||||
{% extends "core/base.jinja" %}
|
||||
{% from "com/macros.jinja" import news_moderation_alert %}
|
||||
|
||||
{% block title %}
|
||||
{% trans %}News{% endtrans %}
|
||||
{% endblock %}
|
||||
|
||||
{% block additional_css %}
|
||||
<link rel="stylesheet" href="{{ static('com/css/news-list.scss') }}">
|
||||
<link rel="stylesheet" href="{{ static('com/components/ics-calendar.scss') }}">
|
||||
|
@@ -1,13 +1,22 @@
|
||||
from datetime import timedelta
|
||||
|
||||
import pytest
|
||||
from django.conf import settings
|
||||
from django.utils.timezone import now
|
||||
from model_bakery import baker
|
||||
|
||||
from com.models import News
|
||||
from com.models import News, NewsDate
|
||||
from core.baker_recipes import subscriber_user
|
||||
from core.models import Group, Notification, User
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_notification_created():
|
||||
# this news is unpublished, but is set in the past
|
||||
# it shouldn't be taken into account when counting the number
|
||||
# of news that are to be moderated
|
||||
past_news = baker.make(News, is_published=False)
|
||||
baker.make(NewsDate, news=past_news, start_date=now() - timedelta(days=1))
|
||||
com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
|
||||
com_admin_group.users.all().delete()
|
||||
Notification.objects.all().delete()
|
||||
@@ -15,9 +24,28 @@ def test_notification_created():
|
||||
for i in range(2):
|
||||
# news notifications are permanent, so the notification created
|
||||
# during the first iteration should be reused during the second one.
|
||||
baker.make(News)
|
||||
baker.make(News, is_published=False)
|
||||
notifications = list(Notification.objects.all())
|
||||
assert len(notifications) == 1
|
||||
assert notifications[0].user == com_admin
|
||||
assert notifications[0].type == "NEWS_MODERATION"
|
||||
assert notifications[0].param == str(i + 1)
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_notification_edited_when_moderating_news():
|
||||
com_admin_group = Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)
|
||||
com_admins = subscriber_user.make(_quantity=3)
|
||||
com_admin_group.users.set(com_admins)
|
||||
Notification.objects.all().delete()
|
||||
news = baker.make(News, is_published=False)
|
||||
assert Notification.objects.count() == 3
|
||||
assert Notification.objects.filter(viewed=False).count() == 3
|
||||
|
||||
news.is_published = True
|
||||
news.moderator = com_admins[0]
|
||||
news.save()
|
||||
# when the news is moderated, the notification should be marked as read
|
||||
# for all admins
|
||||
assert Notification.objects.count() == 3
|
||||
assert Notification.objects.filter(viewed=False).count() == 0
|
||||
|
@@ -560,7 +560,7 @@ class User(AbstractUser):
|
||||
"""Determine if the object is owned by the user."""
|
||||
if hasattr(obj, "is_owned_by") and obj.is_owned_by(self):
|
||||
return True
|
||||
if hasattr(obj, "owner_group") and self.is_in_group(pk=obj.owner_group.id):
|
||||
if hasattr(obj, "owner_group") and self.is_in_group(pk=obj.owner_group_id):
|
||||
return True
|
||||
return self.is_root
|
||||
|
||||
@@ -569,9 +569,15 @@ class User(AbstractUser):
|
||||
if hasattr(obj, "can_be_edited_by") and obj.can_be_edited_by(self):
|
||||
return True
|
||||
if hasattr(obj, "edit_groups"):
|
||||
for pk in obj.edit_groups.values_list("pk", flat=True):
|
||||
if self.is_in_group(pk=pk):
|
||||
return True
|
||||
if (
|
||||
hasattr(obj, "_prefetched_objects_cache")
|
||||
and "edit_groups" in obj._prefetched_objects_cache
|
||||
):
|
||||
pks = [g.id for g in obj.edit_groups.all()]
|
||||
else:
|
||||
pks = list(obj.edit_groups.values_list("id", flat=True))
|
||||
if any(self.is_in_group(pk=pk) for pk in pks):
|
||||
return True
|
||||
if isinstance(obj, User) and obj == self:
|
||||
return True
|
||||
return self.is_owner(obj)
|
||||
@@ -581,9 +587,18 @@ class User(AbstractUser):
|
||||
if hasattr(obj, "can_be_viewed_by") and obj.can_be_viewed_by(self):
|
||||
return True
|
||||
if hasattr(obj, "view_groups"):
|
||||
for pk in obj.view_groups.values_list("pk", flat=True):
|
||||
if self.is_in_group(pk=pk):
|
||||
return True
|
||||
# if "view_groups" has already been prefetched, use
|
||||
# the prefetch cache, else fetch only the ids, to make
|
||||
# the query lighter.
|
||||
if (
|
||||
hasattr(obj, "_prefetched_objects_cache")
|
||||
and "view_groups" in obj._prefetched_objects_cache
|
||||
):
|
||||
pks = [g.id for g in obj.view_groups.all()]
|
||||
else:
|
||||
pks = list(obj.view_groups.values_list("id", flat=True))
|
||||
if any(self.is_in_group(pk=pk) for pk in pks):
|
||||
return True
|
||||
return self.can_edit(obj)
|
||||
|
||||
def can_be_edited_by(self, user):
|
||||
@@ -1384,9 +1399,9 @@ class Page(models.Model):
|
||||
|
||||
@cached_property
|
||||
def is_club_page(self):
|
||||
club_root_page = Page.objects.filter(name=settings.SITH_CLUB_ROOT_PAGE).first()
|
||||
return club_root_page is not None and (
|
||||
self == club_root_page or club_root_page in self.get_parent_list()
|
||||
return (
|
||||
self.name == settings.SITH_CLUB_ROOT_PAGE
|
||||
or settings.SITH_CLUB_ROOT_PAGE in [p.name for p in self.get_parent_list()]
|
||||
)
|
||||
|
||||
@cached_property
|
||||
|
@@ -2,8 +2,14 @@
|
||||
<html lang="fr">
|
||||
<head>
|
||||
{% block head %}
|
||||
<title>{% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %} - Association des Étudiants UTBM</title>
|
||||
<title>{% block title %}Association des Étudiants de l'UTBM{% endblock %}</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="description" content="{% block description -%}
|
||||
{% trans trimmed %}
|
||||
AE UTBM is a voluntary organisation run by UTBM students.
|
||||
It organises student life at UTBM and manages its student facilities.
|
||||
{% endtrans %}
|
||||
{%- endblock %}">
|
||||
<link rel="shortcut icon" href="{{ static('core/img/favicon.ico') }}">
|
||||
<link rel="stylesheet" href="{{ static('core/base.css') }}">
|
||||
<link rel="stylesheet" href="{{ static('core/style.scss') }}">
|
||||
|
@@ -5,16 +5,12 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% if page_list %}
|
||||
<h3>{% trans %}Page list{% endtrans %}</h3>
|
||||
<ul>
|
||||
{% for p in page_list %}
|
||||
<li><a href="{{ p.get_absolute_url() }}">{{ p.get_display_name() }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% else %}
|
||||
{% trans %}There is no page in this website.{% endtrans %}
|
||||
{% endif %}
|
||||
<h3>{% trans %}Page list{% endtrans %}</h3>
|
||||
<ul>
|
||||
{% for p in page_list %}
|
||||
<li><a href="{{ p.get_absolute_url() }}">{{ p.display_name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
|
@@ -12,7 +12,10 @@
|
||||
# OR WITHIN THE LOCAL FILE "LICENSE"
|
||||
#
|
||||
#
|
||||
|
||||
from django.contrib.auth.mixins import PermissionRequiredMixin
|
||||
from django.db.models import F, OuterRef, Subquery
|
||||
from django.db.models.functions import Coalesce
|
||||
|
||||
# This file contains all the views that concern the page model
|
||||
from django.forms.models import modelform_factory
|
||||
@@ -43,6 +46,20 @@ class CanEditPagePropMixin(CanEditPropMixin):
|
||||
class PageListView(CanViewMixin, ListView):
|
||||
model = Page
|
||||
template_name = "core/page_list.jinja"
|
||||
queryset = (
|
||||
Page.objects.annotate(
|
||||
display_name=Coalesce(
|
||||
Subquery(
|
||||
PageRev.objects.filter(page=OuterRef("id"))
|
||||
.order_by("-date")
|
||||
.values("title")[:1]
|
||||
),
|
||||
F("name"),
|
||||
)
|
||||
)
|
||||
.prefetch_related("view_groups")
|
||||
.select_related("parent")
|
||||
)
|
||||
|
||||
|
||||
class PageView(CanViewMixin, DetailView):
|
||||
|
@@ -1,13 +1,19 @@
|
||||
import math
|
||||
|
||||
from django import forms
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.db.models import Q
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django_celery_beat.models import ClockedSchedule, PeriodicTask
|
||||
from phonenumber_field.widgets import RegionalPhoneNumberWidget
|
||||
|
||||
from club.widgets.ajax_select import AutoCompleteSelectClub
|
||||
from core.models import User
|
||||
from core.views.forms import NFCTextInput, SelectDate, SelectDateTime
|
||||
from core.views.forms import (
|
||||
NFCTextInput,
|
||||
SelectDate,
|
||||
SelectDateTime,
|
||||
)
|
||||
from core.views.widgets.ajax_select import (
|
||||
AutoCompleteSelect,
|
||||
AutoCompleteSelectMultipleGroup,
|
||||
@@ -158,6 +164,66 @@ class CounterEditForm(forms.ModelForm):
|
||||
}
|
||||
|
||||
|
||||
class ProductArchiveForm(forms.Form):
|
||||
"""Form for automatic product archiving."""
|
||||
|
||||
enabled = forms.BooleanField(
|
||||
label=_("Enabled"),
|
||||
widget=forms.CheckboxInput(attrs={"class": "switch"}),
|
||||
required=False,
|
||||
)
|
||||
archive_at = forms.DateTimeField(
|
||||
label=_("Date and time of archiving"), widget=SelectDateTime, required=False
|
||||
)
|
||||
|
||||
def __init__(self, *args, product: Product, **kwargs):
|
||||
self.product = product
|
||||
self.instance = PeriodicTask.objects.filter(
|
||||
task="counter.tasks.archive_product", args=f"[{product.id}]"
|
||||
).first()
|
||||
super().__init__(*args, **kwargs)
|
||||
if self.instance:
|
||||
self.fields["enabled"].initial = self.instance.enabled
|
||||
self.fields["archive_at"].initial = self.instance.clocked.clocked_time
|
||||
|
||||
def clean(self):
|
||||
cleaned_data = super().clean()
|
||||
if cleaned_data["enabled"] is True and cleaned_data["archive_at"] is None:
|
||||
raise ValidationError(
|
||||
_(
|
||||
"Automatic archiving cannot be enabled "
|
||||
"without providing a archiving date."
|
||||
)
|
||||
)
|
||||
|
||||
def save(self):
|
||||
if not self.changed_data:
|
||||
return
|
||||
if not self.instance:
|
||||
PeriodicTask.objects.create(
|
||||
task="counter.tasks.archive_product",
|
||||
args=f"[{self.product.id}]",
|
||||
name=f"Archive product {self.product}",
|
||||
clocked=ClockedSchedule.objects.create(
|
||||
clocked_time=self.cleaned_data["archive_at"]
|
||||
),
|
||||
enabled=self.cleaned_data["enabled"],
|
||||
one_off=True,
|
||||
)
|
||||
return
|
||||
if (
|
||||
"archive_at" in self.changed_data
|
||||
and self.cleaned_data["archive_at"] is None
|
||||
):
|
||||
self.instance.delete()
|
||||
elif "archive_at" in self.changed_data:
|
||||
self.instance.clocked.clocked_time = self.cleaned_data["archive_at"]
|
||||
self.instance.clocked.save()
|
||||
self.instance.enabled = self.cleaned_data["enabled"]
|
||||
self.instance.save()
|
||||
return self.instance
|
||||
|
||||
|
||||
class ProductEditForm(forms.ModelForm):
|
||||
error_css_class = "error"
|
||||
required_css_class = "required"
|
||||
@@ -199,22 +265,19 @@ class ProductEditForm(forms.ModelForm):
|
||||
queryset=Counter.objects.all(),
|
||||
)
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super().__init__(*args, **kwargs)
|
||||
def __init__(self, *args, instance=None, **kwargs):
|
||||
super().__init__(*args, instance=instance, **kwargs)
|
||||
if self.instance.id:
|
||||
self.fields["counters"].initial = self.instance.counters.all()
|
||||
self.archive_form = ProductArchiveForm(*args, product=self.instance, **kwargs)
|
||||
|
||||
def is_valid(self):
|
||||
return super().is_valid() and self.archive_form.is_valid()
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
ret = super().save(*args, **kwargs)
|
||||
if self.fields["counters"].initial:
|
||||
# Remove the product from all counter it was added to
|
||||
# It will then only be added to selected counters
|
||||
for counter in self.fields["counters"].initial:
|
||||
counter.products.remove(self.instance)
|
||||
counter.save()
|
||||
for counter in self.cleaned_data["counters"]:
|
||||
counter.products.add(self.instance)
|
||||
counter.save()
|
||||
self.instance.counters.set(self.cleaned_data["counters"])
|
||||
self.archive_form.save()
|
||||
return ret
|
||||
|
||||
|
||||
|
@@ -445,7 +445,8 @@ class Product(models.Model):
|
||||
buying_groups = list(self.buying_groups.all())
|
||||
if not buying_groups:
|
||||
return True
|
||||
return any(user.is_in_group(pk=group.id) for group in buying_groups)
|
||||
res = any(user.is_in_group(pk=group.id) for group in buying_groups)
|
||||
return res
|
||||
|
||||
@property
|
||||
def profit(self):
|
||||
|
13
counter/tasks.py
Normal file
13
counter/tasks.py
Normal file
@@ -0,0 +1,13 @@
|
||||
# Create your tasks here
|
||||
|
||||
from celery import shared_task
|
||||
|
||||
from counter.models import Product
|
||||
|
||||
|
||||
@shared_task
|
||||
def archive_product(product_id):
|
||||
product = Product.objects.get(id=product_id)
|
||||
product.archived = True
|
||||
product.save()
|
||||
product.counters.clear()
|
31
counter/templates/counter/product_form.jinja
Normal file
31
counter/templates/counter/product_form.jinja
Normal file
@@ -0,0 +1,31 @@
|
||||
{% extends "core/base.jinja" %}
|
||||
|
||||
{% block content %}
|
||||
{% if object %}
|
||||
<h2>{% trans name=object %}Edit product {{ name }}{% endtrans %}</h2>
|
||||
{% else %}
|
||||
<h2>{% trans %}Product creation{% endtrans %}</h2>
|
||||
{% endif %}
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
{{ form.as_p() }}
|
||||
|
||||
<br />
|
||||
|
||||
<h3>{% trans %}Automatic archiving{% endtrans %}</h3>
|
||||
|
||||
<p>
|
||||
<em>
|
||||
{%- trans trimmed -%}
|
||||
Automatic archiving allows you to mark a product as archived
|
||||
and remove it from all its counters at a specified time and date.
|
||||
{%- endtrans -%}
|
||||
</em>
|
||||
</p>
|
||||
|
||||
<fieldset x-data="{enabled: {{ form.archive_form.enabled.initial|tojson }}}">
|
||||
{{ form.archive_form.as_p() }}
|
||||
</fieldset>
|
||||
<p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
|
||||
</form>
|
||||
{% endblock %}
|
@@ -147,7 +147,7 @@ class ProductCreateView(CounterAdminTabsMixin, CounterAdminMixin, CreateView):
|
||||
|
||||
model = Product
|
||||
form_class = ProductEditForm
|
||||
template_name = "core/create.jinja"
|
||||
template_name = "counter/product_form.jinja"
|
||||
current_tab = "products"
|
||||
|
||||
|
||||
@@ -157,7 +157,7 @@ class ProductEditView(CounterAdminTabsMixin, CounterAdminMixin, UpdateView):
|
||||
model = Product
|
||||
form_class = ProductEditForm
|
||||
pk_url_kwarg = "product_id"
|
||||
template_name = "core/edit.jinja"
|
||||
template_name = "counter/product_form.jinja"
|
||||
current_tab = "products"
|
||||
|
||||
|
||||
|
@@ -1,8 +1,12 @@
|
||||
{% extends "core/base.jinja" %}
|
||||
|
||||
{% block title %}
|
||||
{% block title -%}
|
||||
{% trans %}Eboutic{% endtrans %}
|
||||
{% endblock %}
|
||||
{%- endblock %}
|
||||
|
||||
{% block description -%}
|
||||
{% trans %}The online shop of the association.{% endtrans %}
|
||||
{%- endblock %}
|
||||
|
||||
{% block additional_js %}
|
||||
{# This script contains the code to perform requests to manipulate the
|
||||
|
@@ -2,9 +2,13 @@
|
||||
{% from 'core/macros.jinja' import user_profile_link %}
|
||||
{% from 'forum/macros.jinja' import display_forum, display_search_bar %}
|
||||
|
||||
{% block title %}
|
||||
{% block title -%}
|
||||
{% trans %}Forum{% endtrans %}
|
||||
{% endblock %}
|
||||
{%- endblock %}
|
||||
|
||||
{% block description -%}
|
||||
{% trans %}A forum dedicated to the UTBM students.{% endtrans %}
|
||||
{%- endblock %}
|
||||
|
||||
{% block additional_css %}
|
||||
<link rel="stylesheet" href="{{ static('forum/css/forum.scss') }}">
|
||||
|
@@ -6,7 +6,7 @@
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2025-08-23 15:30+0200\n"
|
||||
"POT-Creation-Date: 2025-09-14 01:35+0200\n"
|
||||
"PO-Revision-Date: 2016-07-18\n"
|
||||
"Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
|
||||
"Language-Team: AE info <ae.info@utbm.fr>\n"
|
||||
@@ -306,6 +306,10 @@ msgstr "Utilisateur non enregistré"
|
||||
msgid "Club list"
|
||||
msgstr "Liste des clubs"
|
||||
|
||||
#: club/templates/club/club_list.jinja
|
||||
msgid "The list of all clubs existing at UTBM."
|
||||
msgstr "La liste de tous les clubs existants à l'UTBM"
|
||||
|
||||
#: club/templates/club/club_list.jinja
|
||||
msgid "inactive"
|
||||
msgstr "inactif"
|
||||
@@ -557,6 +561,7 @@ msgstr ""
|
||||
#: core/templates/core/user_godfathers_tree.jinja
|
||||
#: core/templates/core/user_preferences.jinja
|
||||
#: counter/templates/counter/cash_register_summary.jinja
|
||||
#: counter/templates/counter/product_form.jinja
|
||||
#: forum/templates/forum/reply.jinja
|
||||
#: subscription/templates/subscription/fragments/creation_form.jinja
|
||||
#: trombi/templates/trombi/comment.jinja
|
||||
@@ -901,7 +906,7 @@ msgid "News admin"
|
||||
msgstr "Administration des nouvelles"
|
||||
|
||||
#: com/templates/com/news_admin_list.jinja com/templates/com/news_detail.jinja
|
||||
#: com/templates/com/news_list.jinja com/views.py
|
||||
#: com/views.py
|
||||
msgid "News"
|
||||
msgstr "Nouvelles"
|
||||
|
||||
@@ -1035,7 +1040,7 @@ msgstr "Liens"
|
||||
msgid "Our services"
|
||||
msgstr "Nos services"
|
||||
|
||||
#: com/templates/com/news_list.jinja pedagogy/templates/pedagogy/guide.jinja
|
||||
#: com/templates/com/news_list.jinja
|
||||
msgid "UV Guide"
|
||||
msgstr "Guide des UVs"
|
||||
|
||||
@@ -1705,8 +1710,12 @@ msgid "500, Server Error"
|
||||
msgstr "500, Erreur Serveur"
|
||||
|
||||
#: core/templates/core/base.jinja
|
||||
msgid "Welcome!"
|
||||
msgstr "Bienvenue !"
|
||||
msgid ""
|
||||
"AE UTBM is a voluntary organisation run by UTBM students. It organises "
|
||||
"student life at UTBM and manages its student facilities."
|
||||
msgstr ""
|
||||
"L'AE UTBM est une association bénévole gérée par les étudiants de l'UTBM. "
|
||||
"Elle organise la vie étudiante de l'UTBM et gère ses lieux de vie."
|
||||
|
||||
#: core/templates/core/base/footer.jinja core/templates/core/base/navbar.jinja
|
||||
msgid "Contacts"
|
||||
@@ -2149,10 +2158,6 @@ msgstr ""
|
||||
msgid "Page history"
|
||||
msgstr "Historique de la page"
|
||||
|
||||
#: core/templates/core/page_list.jinja
|
||||
msgid "There is no page in this website."
|
||||
msgstr "Il n'y a pas de page sur ce site web."
|
||||
|
||||
#: core/templates/core/page_prop.jinja
|
||||
msgid "Page properties"
|
||||
msgstr "Propriétés de la page"
|
||||
@@ -2888,6 +2893,20 @@ msgstr "Cet UID est invalide"
|
||||
msgid "User not found"
|
||||
msgstr "Utilisateur non trouvé"
|
||||
|
||||
#: counter/forms.py
|
||||
msgid "Enabled"
|
||||
msgstr "Activé"
|
||||
|
||||
#: counter/forms.py
|
||||
msgid "Date and time of archiving"
|
||||
msgstr "Date et heure de l'archivage"
|
||||
|
||||
#: counter/forms.py
|
||||
msgid ""
|
||||
"Automatic archiving cannot be enabled without providing a archiving date."
|
||||
msgstr ""
|
||||
"L'archivage automatique ne peut pas activé sans fournir une date d'archivage."
|
||||
|
||||
#: counter/forms.py
|
||||
msgid ""
|
||||
"Describe the product. If it's an event's click, give some insights about it, "
|
||||
@@ -3540,6 +3559,29 @@ msgstr ""
|
||||
"votre cotisation. Si vous ne renouvelez pas votre cotisation, il n'y aura "
|
||||
"aucune conséquence autre que le retrait de l'argent de votre compte."
|
||||
|
||||
#: counter/templates/counter/product_form.jinja
|
||||
#, python-format
|
||||
msgid "Edit product %(name)s"
|
||||
msgstr "Édition du produit %(name)s"
|
||||
|
||||
#: counter/templates/counter/product_form.jinja
|
||||
#, fuzzy
|
||||
#| msgid "Product state"
|
||||
msgid "Product creation"
|
||||
msgstr "Etat du produit"
|
||||
|
||||
#: counter/templates/counter/product_form.jinja
|
||||
msgid "Automatic archiving"
|
||||
msgstr "Archivage automatique"
|
||||
|
||||
#: counter/templates/counter/product_form.jinja
|
||||
msgid ""
|
||||
"Automatic archiving allows you to mark a product as archived and remove it "
|
||||
"from all its counters at a specified time and date."
|
||||
msgstr ""
|
||||
"L'archivage automatique permet de marquer un produit comme archivé et de le "
|
||||
"retirer de tous ses comptoirs à une heure et une date voulues."
|
||||
|
||||
#: counter/templates/counter/product_list.jinja
|
||||
msgid "Product list"
|
||||
msgstr "Liste des produits"
|
||||
@@ -3819,6 +3861,10 @@ msgstr ""
|
||||
msgid "Pay with Sith account"
|
||||
msgstr "Payer avec un compte AE"
|
||||
|
||||
#: eboutic/templates/eboutic/eboutic_main.jinja
|
||||
msgid "The online shop of the association."
|
||||
msgstr "La boutique en ligne de l'association."
|
||||
|
||||
#: eboutic/templates/eboutic/eboutic_main.jinja
|
||||
msgid "Clear"
|
||||
msgstr "Vider"
|
||||
@@ -4148,6 +4194,10 @@ msgstr "Message supprimé ou non-visible."
|
||||
msgid "Order by date"
|
||||
msgstr "Trier par date"
|
||||
|
||||
#: forum/templates/forum/main.jinja
|
||||
msgid "A forum dedicated to the UTBM students."
|
||||
msgstr "Un forum dédié aux étudiants de l'UTBM."
|
||||
|
||||
#: forum/templates/forum/main.jinja
|
||||
msgid "View last unread messages"
|
||||
msgstr "Voir les derniers messages non lus"
|
||||
@@ -4374,6 +4424,14 @@ msgstr "signaler"
|
||||
msgid "reporter"
|
||||
msgstr "signalant"
|
||||
|
||||
#: pedagogy/templates/pedagogy/guide.jinja
|
||||
msgid "UE Guide"
|
||||
msgstr "Guide des UEs"
|
||||
|
||||
#: pedagogy/templates/pedagogy/guide.jinja
|
||||
msgid "A guide of courses available at UTBM."
|
||||
msgstr "Un guide de tous les cours disponibles à l'UTBM."
|
||||
|
||||
#: pedagogy/templates/pedagogy/guide.jinja
|
||||
#, python-format
|
||||
msgid "%(display_name)s"
|
||||
@@ -4666,6 +4724,11 @@ msgstr "Demande de retrait d'image"
|
||||
msgid "Request removal"
|
||||
msgstr "Demander le retrait"
|
||||
|
||||
#: sas/templates/sas/main.jinja
|
||||
msgid "See all the photos taken during events organised by the AE."
|
||||
msgstr ""
|
||||
"Retrouvez toutes les photos prises lors des événements organisés par l'AE."
|
||||
|
||||
#: sas/templates/sas/main.jinja
|
||||
msgid "You must be logged in to see the SAS."
|
||||
msgstr "Vous devez être connecté pour voir les photos."
|
||||
|
@@ -2,9 +2,13 @@
|
||||
{% from 'core/macros.jinja' import paginate_alpine %}
|
||||
|
||||
{% block title %}
|
||||
{% trans %}UV Guide{% endtrans %}
|
||||
{% trans %}UE Guide{% endtrans %}
|
||||
{% endblock %}
|
||||
|
||||
{% block description -%}
|
||||
{% trans %}A guide of courses available at UTBM.{% endtrans %}
|
||||
{%- endblock %}
|
||||
|
||||
{% block additional_css %}
|
||||
<link rel="stylesheet" href="{{ static('pedagogy/css/pedagogy.scss') }}">
|
||||
{% endblock %}
|
||||
|
@@ -8,6 +8,10 @@
|
||||
{% trans %}SAS{% endtrans %}
|
||||
{% endblock %}
|
||||
|
||||
{% block description -%}
|
||||
{% trans %}See all the photos taken during events organised by the AE.{% endtrans %}
|
||||
{%- endblock %}
|
||||
|
||||
{% set is_sas_admin = user.is_root or user.is_in_group(pk=settings.SITH_GROUP_SAS_ADMIN_ID) %}
|
||||
|
||||
{% from "sas/macros.jinja" import display_album %}
|
||||
|
@@ -99,9 +99,10 @@ INSTALLED_APPS = (
|
||||
"django.contrib.auth",
|
||||
"django.contrib.contenttypes",
|
||||
"django.contrib.sessions",
|
||||
"django.contrib.sitemaps",
|
||||
"django.contrib.sites",
|
||||
"django.contrib.messages",
|
||||
"staticfiles",
|
||||
"django.contrib.sites",
|
||||
"honeypot",
|
||||
"django_jinja",
|
||||
"ninja_extra",
|
||||
@@ -686,8 +687,10 @@ SITH_NOTIFICATIONS = [
|
||||
# The keys are the notification names as found in SITH_NOTIFICATIONS, and the
|
||||
# values are the callback function to update the notifs.
|
||||
# The callback must take the notif object as first and single argument.
|
||||
# If a notification is permanent but requires no post-action, set the
|
||||
# callback import string as None
|
||||
SITH_PERMANENT_NOTIFICATIONS = {
|
||||
"NEWS_MODERATION": "com.models.news_notification_callback",
|
||||
"NEWS_MODERATION": None,
|
||||
"SAS_MODERATION": "sas.models.sas_notification_callback",
|
||||
}
|
||||
|
||||
|
46
sith/sitemap.py
Normal file
46
sith/sitemap.py
Normal file
@@ -0,0 +1,46 @@
|
||||
from django.conf import settings
|
||||
from django.contrib.sitemaps import Sitemap
|
||||
from django.db.models import OuterRef, Subquery
|
||||
from django.urls import reverse
|
||||
|
||||
from club.models import Club
|
||||
from core.models import Page, PageRev
|
||||
|
||||
|
||||
class SithSitemap(Sitemap):
|
||||
def items(self):
|
||||
return [
|
||||
"core:index",
|
||||
"eboutic:main",
|
||||
"sas:main",
|
||||
"forum:main",
|
||||
"club:club_list",
|
||||
"election:list",
|
||||
]
|
||||
|
||||
def location(self, item):
|
||||
return reverse(item)
|
||||
|
||||
|
||||
class PagesSitemap(Sitemap):
|
||||
def items(self):
|
||||
return (
|
||||
Page.objects.filter(view_groups=settings.SITH_GROUP_PUBLIC_ID)
|
||||
.exclude(revisions=None, _full_name__startswith="club")
|
||||
.annotate(
|
||||
lastmod=Subquery(
|
||||
PageRev.objects.filter(page=OuterRef("pk"))
|
||||
.values("date")
|
||||
.order_by("-date")[:1]
|
||||
)
|
||||
)
|
||||
.all()
|
||||
)
|
||||
|
||||
def lastmod(self, item: Page):
|
||||
return item.lastmod
|
||||
|
||||
|
||||
class ClubSitemap(Sitemap):
|
||||
def items(self):
|
||||
return Club.objects.filter(is_active=True)
|
@@ -15,20 +15,24 @@
|
||||
from django.conf import settings
|
||||
from django.conf.urls.static import static
|
||||
from django.contrib import admin
|
||||
from django.contrib.sitemaps.views import sitemap
|
||||
from django.http import Http404
|
||||
from django.urls import include, path
|
||||
from django.views.decorators.cache import cache_page
|
||||
from django.views.i18n import JavaScriptCatalog
|
||||
|
||||
from api.urls import api
|
||||
from sith.sitemap import ClubSitemap, PagesSitemap, SithSitemap
|
||||
|
||||
js_info_dict = {"packages": ("sith",)}
|
||||
|
||||
handler403 = "core.views.forbidden"
|
||||
handler404 = "core.views.not_found"
|
||||
handler500 = "core.views.internal_servor_error"
|
||||
|
||||
sitemaps = {"sith": SithSitemap, "pages": PagesSitemap, "clubs": ClubSitemap}
|
||||
urlpatterns = [
|
||||
path("", include(("core.urls", "core"), namespace="core")),
|
||||
path("sitemap.xml", cache_page(86400)(sitemap), {"sitemaps": sitemaps}),
|
||||
path("api/", api.urls),
|
||||
path("rootplace/", include(("rootplace.urls", "rootplace"), namespace="rootplace")),
|
||||
path(
|
||||
|
Reference in New Issue
Block a user