Modification of the weekmail template

update link for poetry install

.envrc

@@ -0,0 +1,14 @@
+if [[ ! -f pyproject.toml ]]; then
+  log_error 'No pyproject.toml found. Use `poetry new` or `poetry init` to create one first.'
+  exit 2
+fi
+
+local VENV=$(poetry env list --full-path | cut -d' ' -f1)
+if [[ -z $VENV || ! -d $VENV/bin ]]; then
+  log_error 'No poetry virtual environment found. Use `poetry install` to create one first.'
+  exit 2
+fi
+
+export VIRTUAL_ENV=$VENV
+export POETRY_ACTIVE=1
+PATH_add "$VENV/bin"

.gitattributes

@@ -0,0 +1,2 @@
+/locale/fr/LC_MESSAGES/django.po gitlab-language=python
+*.jinja gitlab-language=jinja

.github/auto_assign.yml

@@ -0,0 +1,13 @@
+# Set to true to add reviewers to pull requests
+addReviewers: true
+
+# Set to true to add assignees to pull requests
+addAssignees: author
+
+# A list of team reviewers to be added to pull requests (GitHub team slug)
+reviewers:
+  - ae-utbm/sith-3-developers
+
+# Number of reviewers has no impact on GitHub teams
+# Set 0 to add all the reviewers (default: 0)
+numberOfReviewers: 0

.github/workflows/deploy.yml

@@ -0,0 +1,64 @@
+name: Deploy to production
+concurrency: production
+
+on:
+  push:
+    branches: [master]
+  workflow_dispatch:
+
+jobs:
+  deployment:
+    runs-on: ubuntu-latest
+    environment: production
+    timeout-minutes: 30
+  
+    steps:
+    - name: SSH Remote Commands
+      uses: appleboy/ssh-action@dce9d565de8d876c11d93fa4fe677c0285a66d78
+      with:
+        # Proxy
+        proxy_host : ${{secrets.PROXY_HOST}}
+        proxy_port : ${{secrets.PROXY_PORT}}
+        proxy_username : ${{secrets.PROXY_USER}}
+        proxy_passphrase: ${{secrets.PROXY_PASSPHRASE}}
+        proxy_key: ${{secrets.PROXY_KEY}}
+        
+        # Serveur web
+        host: ${{secrets.HOST}}
+        port : ${{secrets.PORT}}
+        username : ${{secrets.USER}}
+        key: ${{secrets.KEY}}
+
+        script_stop: true
+
+        # See https://github.com/ae-utbm/sith3/wiki/GitHub-Actions#deployment-action
+        script: |
+          export PATH="$HOME/.poetry/bin:$PATH"
+          pushd ${{secrets.SITH_PATH}}
+
+          git pull
+          poetry update
+          poetry run ./manage.py migrate
+          echo "yes" | poetry run ./manage.py collectstatic
+          poetry run ./manage.py compilestatic
+          poetry run ./manage.py compilemessages
+
+          sudo systemctl restart uwsgi
+  
+  sentry:
+    runs-on: ubuntu-latest
+    environment: production
+    timeout-minutes: 30
+    needs: deployment
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Sentry Release
+        uses: getsentry/action-release@v1.2.0
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+          SENTRY_URL: ${{ secrets.SENTRY_URL }}
+        with:
+          environment: production

.github/workflows/unittests.yml

@@ -0,0 +1,83 @@
+name: Sith3 CI
+
+on:
+  pull_request:
+    branches: [ master ]
+  push:
+    branches: [ master ]
+    
+jobs:
+  unittests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+
+    steps:
+      - uses: actions/checkout@v3
+
+      # Skip unit testing if no diff on .py files
+      - name: Check file diff
+        uses: technote-space/get-diff-action@v6
+        id: git-diff
+        with:
+          PATTERNS: |
+            **/*.py
+
+      - name: Set up python
+        if: steps.git-diff.outputs.diff
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+
+      - name: Install dependencies
+        if: steps.git-diff.outputs.diff
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext libxapian-dev libgraphviz-dev
+
+      - name: Install poetry
+        if: steps.git-diff.outputs.diff
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install poetry
+
+      - name: Checking pyproject.toml syntax
+        if: steps.git-diff.outputs.diff
+        run: poetry check
+
+      - name: Install project
+        if: steps.git-diff.outputs.diff
+        run: poetry install -E testing
+
+      - name: Setup xapian index
+        if: steps.git-diff.outputs.diff
+        run: |
+          mkdir -p /dev/shm/search_indexes
+          ln -s /dev/shm/search_indexes sith/search_indexes
+
+      - name: Setup project
+        if: steps.git-diff.outputs.diff
+        run: poetry run ./manage.py compilemessages
+      
+      - name: Launch tests and generate coverage report
+        if: steps.git-diff.outputs.diff
+        run: |
+          poetry run coverage run ./manage.py test
+          poetry run coverage report
+  
+  lint:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+
+      - name: Install black
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install black==22.6.0
+
+      - name: Check linting
+        run: black --check .

.gitignore

@@ -4,6 +4,8 @@ db.sqlite3
 *.mo
 *__pycache__*
 .DS_Store
+pyrightconfig.json
+dist/
 .vscode/
 env/
 doc/html
@@ -13,3 +15,4 @@ sith/settings_custom.py
 sith/search_indexes/
 .coverage
 coverage_report/
+doc/_build

.gitlab-ci.yml

@@ -1,26 +0,0 @@
-stages:
-  - test
-
-test:
-  stage: test
-  script:
-  - apt-get update
-  - apt-get install -y gettext python3-xapian
-  - pushd /usr/lib/python3/dist-packages/xapian && ln -s _xapian* _xapian.so && popd
-  - export PYTHONPATH="/usr/lib/python3/dist-packages:$PYTHONPATH"
-  - python -c 'import xapian' # Fail immediately if there is a problem with xapian
-  - pip install -r requirements.txt
-  - pip install coverage
-  - ./manage.py compilemessages
-  - coverage run ./manage.py test
-  - coverage html
-  - coverage report
-  artifacts:
-    paths:
-      - coverage_report/
-
-black:
-  stage: test
-  script:
-    - pip install black
-    - black --check .

.mailmap

@@ -0,0 +1,18 @@
+Code <gregoire.duvauchelle@utbm.fr>
+Cyl <labetowiez@aol.fr>
+Juste <maaxleblanc@gmail.com>
+Krophil <pierre.brunet@krophil.fr>
+Lo-J <renaudg779@gmail.com>
+Nabos <gnikwo@hotmail.com>
+Och <francescowitz68@gmail.com>
+Partoo <joqaste@gmail.com>
+Skia <skia@hya.sk> <lordbanana25@mailoo.org>
+Skia <skia@hya.sk> <skia@libskia.so>
+Sli <klmp200@klmp200.net> <antoine@bartuccio.fr>
+Soldat <ryan-68@live.fr>
+Terre <jbaptiste.lenglet+git@gmail.com>
+Vial <robin.trioux@utbm.fr>
+Zar <antoine.charmeau@utbm.fr> <antoine.charmeau@laposte.net>
+root <root@localhost.localdomain>
+tleb <tleb@openmailbox.org> <theo.lebrun@live.fr>
+tleb <tleb@openmailbox.org> <theo.lebrun@utbm.fr>

.readthedocs.yml

@@ -0,0 +1,26 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Allow installing xapian-bindings in pip
+build:
+  apt_packages:
+    - libxapian-dev
+
+# Build documentation in the doc/ directory with Sphinx
+sphinx:
+  configuration: doc/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats: all
+
+# Optionally set the version of Python and requirements required to build your docs
+python:
+  version: 3.8
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

CONTRIBUTING.md

@@ -1,106 +0,0 @@
-*Contribuer c'est la vie*
-=========================
-
-Hey ! Tu veux devenir un mec bien et en plus devenir bon en python si tu l'es pas déjà ?
-Il se trouve que le sith AE prévu pour l'été 2016 a besoin de toi !
-
-Pour faire le sith, on utilise le framework Web [Django](https://docs.djangoproject.com/fr/1.11/intro/)  
-N'hésite pas à lire les tutos et à nous demander (ae.info@utbm.fr).
-
-Bon, passons aux choses sérieuses, pour bidouiller le sith sans le casser :  
-Ben en fait, tu peux pas le casser, tu vas juste t'amuser comme un petit fou sur un clone du sith.
-
-C'est pas compliqué, il suffit d'avoir [Git](http://www.git-scm.com/book/fr/v2), python et pip (pour faciliter la gestion des paquets python).
-
-Tout d'abord, tu vas avoir besoin d'un compte Gitlab pour pouvoir te connecter.  
-Ensuite, tu fais :
-`git clone https://ae-dev.utbm.fr/ae/Sith.git`
-Avec cette commande, tu clones le sith AE dans le dossier courant.
-
-```bash
-cd Sith
-virtualenv --system-site-packages --python=python3 env
-source env_sith/bin/activate
-pip install -r requirements.txt
-```
-
-Attention aux dépendances système, à voir dans le README.md
-
-Maintenant, faut passer le sith en mode debug dans le fichier de settings personnalisé.
-
-```bash
-echo "DEBUG=True" > sith/settings_custom.py
-echo 'EXTERNAL_RES = "False"' >> sith/settings_custom.py
-echo 'SITH_URL = "localhost:8000"' >> sith/settings_custom.py
-```
-
-Enfin, il s'agit de créer la base de donnée de test lors de la première utilisation
-
-```bash
-./manage.py setup
-```
-
-Et pour lancer le sith, tu fais `python3 manage.py runserver`
-
-Voilà, c'est le sith AE. Il y a des issues dans le gitlab qui sont à régler. Si tu as un domaine qui t'intéresse, une appli que tu voudrais développer, n'hésites pas et contacte-nous.
-Va, et que l'AE soit avec toi.
-
-# Black
-
-Pour uniformiser le formattage du code nous utilisons [Black](https://github.com/ambv/black). Cela permet d'avoir le même codestyle et donc le codereview prend moins de temps. Tout étant dans le même format, il est plus facile pour chacun de comprendre le code de chacun ! Cela permet aussi d'éviter des erreurs (y parait 🤷‍♀️).
-
-Installation de black:
-
-```bash
-pip install black
-```
-
-## Sous VsCode:
-Attention, pour VsCode, Black doit être installé dans votre virtualenv !
-Ajouter ces deux lignes dans les settings de VsCode
-
-```json
-{
-    "python.formatting.provider": "black",
-    "editor.formatOnSave": true
-}
-```
-
-## Sous Sublime Text
-Il faut installer le plugin [sublack](https://packagecontrol.io/packages/sublack) depuis Package Control.
-
-Il suffit ensuite d'ajouter dans les settings du projet (ou en global)
-
-```json
-{
-    "sublack.black_on_save": true
-}
-```
-
-Si vous utilisez le plugin [anaconda](http://damnwidget.github.io/anaconda/), pensez à modifier les paramètres du linter pep8 pour éviter de recevoir des warnings dans le formatage de black
-
-```json
-{
-    "pep8_ignore": [
-      "E203",
-      "E266",
-      "E501",
-      "W503"
-    ]
-}
-```
-
-Sites et doc cools
-------------------
-
-[Classy Class-Based Views](http://ccbv.co.uk/projects/Django/1.11/)
-
-Helpers:
-
-`./manage.py makemessages --ignore "env/*" -e py,jinja`
-
-`for f in $(find . -name "*.py" ! -path "*migration*" ! -path "./env/*" ! -path "./doc/*"); do cat ./doc/header "$f" > /tmp/temp && mv /tmp/temp "$f"; done`
-
-
-
-

CONTRIBUTING.rst

@@ -0,0 +1,3 @@
+Pour contribuer au projet, vous pouvez vous référer à la documentation disponible à https://sith-ae.readthedocs.io/.
+
+Et n'oubliez pas, contribuer c'est la vie !

README.md

@@ -1,102 +1,41 @@
-[![pipeline status](https://ae-dev.utbm.fr/ae/Sith/badges/master/pipeline.svg)](https://ae-dev.utbm.fr/ae/Sith/commits/master)
-[![coverage report](https://ae-dev.utbm.fr/ae/Sith/badges/master/coverage.svg)](https://ae-dev.utbm.fr/ae/Sith/commits/master)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
-[![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://ae-dev.zulipchat.com)
+<p align="center">
+  <a href="#">
+    <img src="https://img.shields.io/badge/Code%20Style-Black-000000?style=for-the-badge">
+  </a>
+  <a href="#">
+    <img src="https://img.shields.io/github/checks-status/ae-utbm/sith3/master?logo=github&style=for-the-badge&label=BUILD">
+  </a>
+  <a href="https://sith-ae.readthedocs.io/">
+    <img src="https://img.shields.io/readthedocs/sith-ae?logo=readthedocs&style=for-the-badge">
+  </a>
+  <a href="https://discord.gg/XK9WfPsUFm">
+    <img src="https://img.shields.io/discord/889796155523874847?label=Discord&logo=discord&style=for-the-badge">
+  </a>
+</p>
 
-## Sith AE
+<h3 align="center">This is the source code of the UTBM's student association available at https://ae.utbm.fr/.</h3>
 
-### Get started
+<p align="justify">All documentation is in the <code>docs</code> directory and online at https://sith-ae.readthedocs.io/. This documentation is written in French because it targets a French audience and it's too much work to maintain two versions. The code and code comments are strictly written in English.</p>
 
-To start working on the project, just run the following commands:
+<h4>If you want to contribute, here's how we recommend to read the docs:</h4>
 
-```bash
-git clone https://ae-dev.utbm.fr/ae/Sith.git
-cd Sith
-virtualenv --system-site-packages --python=python3 env
-source env/bin/activate
-pip install -r requirements.txt
-./manage.py setup
-```
-
-To start the simple development server, just run `python3 manage.py runserver`
-
-### Logging errors with sentry
-
-To connect the app to sentry.io, you must set the variable SENTRY_DSN in your settings custom. It's composed of the full link given on your sentry project
-
-### Generating documentation
-
-There is a Doxyfile at the root of the project, meaning that if you have Doxygen, you can run `doxygen Doxyfile` to
-generate a complete HTML documentation that will be available in the *./doc/html/* folder.
-
-### Dependencies:
-See requirements.txt
-
-You may need to install some dev libraries like `libmysqlclient-dev`, `libssl-dev`, `libjpeg-dev`, `python3-xapian`, or `zlib1g-dev` to install all the
-requiered dependancies with pip. You may also need `mysql-client`. Don't also forget `python3-dev` if you don't have it
-already.
-
-You can check all of them with:
-
-```bash
-sudo apt install libmysqlclient-dev libssl-dev libjpeg-dev zlib1g-dev python3-dev libffi-dev python3-dev libgraphviz-dev pkg-config python3-xapian
-```
-
-On macos, you will need homebrew
-
-```bash
-brew install xapian
-```
-
-If it doesn't work it's because it need [this pull request](https://github.com/Homebrew/homebrew-core/pull/34835) to be validated.
-
-The development is done with sqlite, but it is advised to set a more robust DBMS for production (Postgresql for example)
-
-### Collecting statics for production:
-
-We use scss in the project. In development environment (DEBUG=True), scss is compiled every time the file is needed. For production, it assumes you have already compiled every files and to do so, you need to use the following commands : 
-
-```bash
-./manage.py collectstatic # To collect statics
-./manage.py compilestatic # To compile scss in those statics
-```
-
-### Misc about development
-
-#### Controlling the rights
-
-When you need to protect an object, there are three levels:
-  * Editing the object properties
-  * Editing the object various values
-  * Viewing the object
-
-Now you have many solutions in your model:
-  * You can define a `is_owned_by(self, user)`, a `can_be_edited_by(self, user)`, and/or a `can_be_viewed_by(self, user)`
-    method, each returning True is the user passed can edit/view the object, False otherwise.   
-    This allows you to make complex request when the group solution is not powerful enough.    
-    It's useful too when you want to define class-wide permissions, e.g. the club members, that are viewable only for
-    Subscribers.
-  * You can add an `owner_group` field, as a ForeignKey to Group.  Second is an `edit_groups` field, as a ManyToMany to
-    Group, and third is a `view_groups`, same as for edit.
-
-Finally, when building a class based view, which is highly advised, you just have to inherit it from CanEditPropMixin,
-CanEditMixin, or CanViewMixin, which are located in core.views. Your view will then be protected using either the
-appropriate group fields, or the right method to check user permissions.
-
-#### Counting the number of line of code
-
-```bash
-sudo apt install cloc
-cloc --exclude-dir=doc,env .
-```
-
-#### Updating doc/SYNTAX.md
-
-If you make an update in the Markdown syntax parser, it's good to document
-update the syntax reference page in `doc/SYNTAX.md`. But updating this file will
-break the tests if you don't update the corresponding `doc/SYNTAX.html` file at
-the same time.  
-To do that, simply run `./manage.py markdown > doc/SYNTAX.html`,
-and the tests should pass again.
+<ul>
+  <li>
+    <p align="justify">
+      First, it's advised to read the about part of the project to understand the goals and the mindset of the current and previous maintainers and know what to expect to learn.
+    </p>
+  </li>
+  <li>
+    <p align="justify">
+      If in the first part you realize that you need more background about what we use, we provide some links to tutorials and documentation at the end of our documentation. Feel free to use it and complete it with what you found helpful.
+    </p>
+  </li>
+  <li>
+    <p align="justify">
+      Keep in mind that this documentation is thought to be read in order.
+    </p>
+  </li>
+</ul>
 
+> This project is licenced under GNU GPL, see the LICENSE file at the top of the repository for more details.
 

TODO.md

@@ -1,9 +0,0 @@
-# TODO
-
-## Easter eggs
-
-  * 'A' 'L' 'L' 'O': Entendre le Allooo de Madame Coucoune
-  * idem avec cacafe
-  * Un meat spin quelque part
-  * Konami code
-

accounting/migrations/0001_initial.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 from django.db import migrations, models
 import django.core.validators
 import accounting.models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -243,6 +244,7 @@ class Migration(migrations.Migration):
                         verbose_name="accounting type",
                         to="accounting.AccountingType",
                         blank=True,
+                        on_delete=django.db.models.deletion.CASCADE,
                     ),
                 ),
             ],
@@ -267,6 +269,7 @@ class Migration(migrations.Migration):
                         verbose_name="simplified accounting types",
                         to="accounting.AccountingType",
                         related_name="simplified_types",
+                        on_delete=django.db.models.deletion.CASCADE,
                     ),
                 ),
             ],

accounting/migrations/0002_auto_20160824_2152.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -22,6 +23,7 @@ class Migration(migrations.Migration):
                 verbose_name="invoice",
                 to="core.SithFile",
                 blank=True,
+                on_delete=django.db.models.deletion.CASCADE,
             ),
         ),
         migrations.AddField(
@@ -31,12 +33,14 @@ class Migration(migrations.Migration):
                 verbose_name="journal",
                 to="accounting.GeneralJournal",
                 related_name="operations",
+                on_delete=django.db.models.deletion.CASCADE,
             ),
         ),
         migrations.AddField(
             model_name="operation",
             name="linked_operation",
             field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
                 blank=True,
                 to="accounting.Operation",
                 null=True,
@@ -54,6 +58,7 @@ class Migration(migrations.Migration):
                 verbose_name="simple type",
                 to="accounting.SimplifiedAccountingType",
                 blank=True,
+                on_delete=django.db.models.deletion.CASCADE,
             ),
         ),
         migrations.AddField(
@@ -63,6 +68,7 @@ class Migration(migrations.Migration):
                 verbose_name="club account",
                 to="accounting.ClubAccount",
                 related_name="journals",
+                on_delete=django.db.models.deletion.CASCADE,
             ),
         ),
         migrations.AddField(
@@ -72,20 +78,27 @@ class Migration(migrations.Migration):
                 verbose_name="bank account",
                 to="accounting.BankAccount",
                 related_name="club_accounts",
+                on_delete=django.db.models.deletion.CASCADE,
             ),
         ),
         migrations.AddField(
             model_name="clubaccount",
             name="club",
             field=models.ForeignKey(
-                verbose_name="club", to="club.Club", related_name="club_account"
+                verbose_name="club",
+                to="club.Club",
+                related_name="club_account",
+                on_delete=django.db.models.deletion.CASCADE,
             ),
         ),
         migrations.AddField(
             model_name="bankaccount",
             name="club",
             field=models.ForeignKey(
-                verbose_name="club", to="club.Club", related_name="bank_accounts"
+                verbose_name="club",
+                to="club.Club",
+                related_name="bank_accounts",
+                on_delete=django.db.models.deletion.CASCADE,
             ),
         ),
         migrations.AlterUniqueTogether(

accounting/migrations/0004_auto_20161005_1505.py

@@ -29,6 +29,7 @@ class Migration(migrations.Migration):
                         related_name="labels",
                         verbose_name="club account",
                         to="accounting.ClubAccount",
+                        on_delete=django.db.models.deletion.CASCADE,
                     ),
                 ),
             ],

accounting/models.py

@@ -22,12 +22,12 @@
 #
 #
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.exceptions import ValidationError
 from django.core import validators
 from django.db import models
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.template import defaultfilters
 
 from phonenumber_field.modelfields import PhoneNumberField
@@ -110,7 +110,12 @@ class BankAccount(models.Model):
     name = models.CharField(_("name"), max_length=30)
     iban = models.CharField(_("iban"), max_length=255, blank=True)
     number = models.CharField(_("account number"), max_length=255, blank=True)
-    club = models.ForeignKey(Club, related_name="bank_accounts", verbose_name=_("club"))
+    club = models.ForeignKey(
+        Club,
+        related_name="bank_accounts",
+        verbose_name=_("club"),
+        on_delete=models.CASCADE,
+    )
 
     class Meta:
         verbose_name = _("Bank account")
@@ -136,9 +141,17 @@ class BankAccount(models.Model):
 
 class ClubAccount(models.Model):
     name = models.CharField(_("name"), max_length=30)
-    club = models.ForeignKey(Club, related_name="club_account", verbose_name=_("club"))
+    club = models.ForeignKey(
+        Club,
+        related_name="club_account",
+        verbose_name=_("club"),
+        on_delete=models.CASCADE,
+    )
     bank_account = models.ForeignKey(
-        BankAccount, related_name="club_accounts", verbose_name=_("bank account")
+        BankAccount,
+        related_name="club_accounts",
+        verbose_name=_("bank account"),
+        on_delete=models.CASCADE,
     )
 
     class Meta:
@@ -203,7 +216,11 @@ class GeneralJournal(models.Model):
     name = models.CharField(_("name"), max_length=40)
     closed = models.BooleanField(_("is closed"), default=False)
     club_account = models.ForeignKey(
-        ClubAccount, related_name="journals", null=False, verbose_name=_("club account")
+        ClubAccount,
+        related_name="journals",
+        null=False,
+        verbose_name=_("club account"),
+        on_delete=models.CASCADE,
     )
     amount = CurrencyField(_("amount"), default=0)
     effective_amount = CurrencyField(_("effective_amount"), default=0)
@@ -263,7 +280,11 @@ class Operation(models.Model):
 
     number = models.IntegerField(_("number"))
     journal = models.ForeignKey(
-        GeneralJournal, related_name="operations", null=False, verbose_name=_("journal")
+        GeneralJournal,
+        related_name="operations",
+        null=False,
+        verbose_name=_("journal"),
+        on_delete=models.CASCADE,
     )
     amount = CurrencyField(_("amount"))
     date = models.DateField(_("date"))
@@ -282,6 +303,7 @@ class Operation(models.Model):
         verbose_name=_("invoice"),
         null=True,
         blank=True,
+        on_delete=models.CASCADE,
     )
     done = models.BooleanField(_("is done"), default=False)
     simpleaccounting_type = models.ForeignKey(
@@ -290,6 +312,7 @@ class Operation(models.Model):
         verbose_name=_("simple type"),
         null=True,
         blank=True,
+        on_delete=models.CASCADE,
     )
     accounting_type = models.ForeignKey(
         "AccountingType",
@@ -297,6 +320,7 @@ class Operation(models.Model):
         verbose_name=_("accounting type"),
         null=True,
         blank=True,
+        on_delete=models.CASCADE,
     )
     label = models.ForeignKey(
         "Label",
@@ -328,6 +352,7 @@ class Operation(models.Model):
         null=True,
         blank=True,
         default=None,
+        on_delete=models.CASCADE,
     )
 
     class Meta:
@@ -487,6 +512,7 @@ class SimplifiedAccountingType(models.Model):
         AccountingType,
         related_name="simplified_types",
         verbose_name=_("simplified accounting types"),
+        on_delete=models.CASCADE,
     )
 
     class Meta:
@@ -518,7 +544,10 @@ class Label(models.Model):
 
     name = models.CharField(_("label"), max_length=64)
     club_account = models.ForeignKey(
-        ClubAccount, related_name="labels", verbose_name=_("club account")
+        ClubAccount,
+        related_name="labels",
+        verbose_name=_("club account"),
+        on_delete=models.CASCADE,
     )
 
     class Meta:

accounting/templates/accounting/journal_statement_accounting.jinja

@@ -20,14 +20,14 @@
             {% for k,v in statement.items() %}
             <tr>
                 <td>{{ k }}</td>
-                <td>{{ v }}</td>
+                <td>{{ "%.2f" % v }}</td>
             </tr>
             {% endfor %}
         </tbody>
 
     </table>
 
-    <p><strong>{% trans %}Amount: {% endtrans %}</strong>{{ object.amount }} €</p>
-    <p><strong>{% trans %}Effective amount: {% endtrans %}</strong>{{ object.effective_amount }} €</p>
+    <p><strong>{% trans %}Amount: {% endtrans %}</strong>{{ "%.2f" % object.amount }} €</p>
+    <p><strong>{% trans %}Effective amount: {% endtrans %}</strong>{{ "%.2f" %object.effective_amount }} €</p>
 </div>
 {% endblock %}

accounting/templates/accounting/journal_statement_nature.jinja

@@ -18,12 +18,12 @@
             {% for k,v in dict['CREDIT'].items() %}
             <tr>
                 <td>{{ k }}</td>
-                <td>{{ v }}</td>
+                <td>{{ "%.2f" % v }}</td>
             </tr>
             {% endfor %}
         </tbody>
     </table>
-    {% trans %}Total: {% endtrans %}{{ dict['CREDIT_sum'] }}
+    {% trans %}Total: {% endtrans %}{{ "%.2f" % dict['CREDIT_sum'] }}
 
     <h6>{% trans %}Debit{% endtrans %}</h6>
     <table>
@@ -37,19 +37,19 @@
             {% for k,v in dict['DEBIT'].items() %}
             <tr>
                 <td>{{ k }}</td>
-                <td>{{ v }}</td>
+                <td>{{ "%.2f" % v }}</td>
             </tr>
             {% endfor %}
         </tbody>
     </table>
-    {% trans %}Total: {% endtrans %}{{ dict['DEBIT_sum'] }}
+    {% trans %}Total: {% endtrans %}{{ "%.2f" % dict['DEBIT_sum'] }}
     {% endmacro %}
 
     {% block content %}
     <h3>{% trans %}Statement by nature: {% endtrans %} {{ object.name }}</h3>
 
     {% for k,v in statement.items() %}
-        <h4 style="background: lightblue; padding: 4px;">{{ k }} : {{ v['CREDIT_sum'] - v['DEBIT_sum'] }}</h4>
+        <h4 style="background: lightblue; padding: 4px;">{{ k }} : {{ "%.2f" % (v['CREDIT_sum'] - v['DEBIT_sum']) }}</h4>
     {{ display_tables(v) }}
     <hr>
     {% endfor %}

accounting/templates/accounting/journal_statement_person.jinja

@@ -28,14 +28,14 @@
                 {% else %}
                 <td></td>
                 {% endif %}
-                <td>{{ credit_statement[key] }}</td>
+                <td>{{ "%.2f" % credit_statement[key] }}</td>
             </tr>
             {% endfor %}
         </tbody>
 
     </table>
 
-    <p>Total : {{ total_credit }}</p>
+    <p>Total : {{ "%.2f" % total_credit }}</p>
 
     <h4>{% trans %}Debit{% endtrans %}</h4>
 
@@ -56,13 +56,13 @@
                 {% else %}
                 <td></td>
                 {% endif %}
-                <td>{{ debit_statement[key] }}</td>
+                <td>{{ "%.2f" % debit_statement[key] }}</td>
             </tr>
             {% endfor %}
         </tbody>
 
     </table>
 
-    <p>Total : {{ total_debit }}</p>
+    <p>Total : {{ "%.2f" % total_debit }}</p>
 </div>
 {% endblock %}

accounting/tests.py

@@ -23,9 +23,9 @@
 #
 
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.management import call_command
-from datetime import date
+from datetime import date, timedelta
 
 from core.models import User
 from accounting.models import (
@@ -110,6 +110,9 @@ class JournalTest(TestCase):
 class OperationTest(TestCase):
     def setUp(self):
         call_command("populate")
+        self.tomorrow_formatted = (date.today() + timedelta(days=1)).strftime(
+            "%d/%m/%Y"
+        )
         self.journal = GeneralJournal.objects.filter(id=1).first()
         self.skia = User.objects.filter(username="skia").first()
         at = AccountingType(
@@ -158,7 +161,7 @@ class OperationTest(TestCase):
                 "target_type": "OTHER",
                 "target_id": "",
                 "target_label": "Le fantome de la nuit",
-                "date": "04/12/2020",
+                "date": self.tomorrow_formatted,
                 "mode": "CASH",
                 "cheque_number": "",
                 "invoice": "",
@@ -191,7 +194,7 @@ class OperationTest(TestCase):
                 "target_type": "OTHER",
                 "target_id": "",
                 "target_label": "Le fantome de la nuit",
-                "date": "04/12/2020",
+                "date": self.tomorrow_formatted,
                 "mode": "CASH",
                 "cheque_number": "",
                 "invoice": "",
@@ -218,7 +221,7 @@ class OperationTest(TestCase):
                 "target_type": "OTHER",
                 "target_id": "",
                 "target_label": "Le fantome du jour",
-                "date": "04/12/2020",
+                "date": self.tomorrow_formatted,
                 "mode": "CASH",
                 "cheque_number": "",
                 "invoice": "",
@@ -245,7 +248,7 @@ class OperationTest(TestCase):
                 "target_type": "OTHER",
                 "target_id": "",
                 "target_label": "Le fantome de l'aurore",
-                "date": "04/12/2020",
+                "date": self.tomorrow_formatted,
                 "mode": "CASH",
                 "cheque_number": "",
                 "invoice": "",
@@ -272,30 +275,50 @@ class OperationTest(TestCase):
 
     def test_nature_statement(self):
         self.client.login(username="comptable", password="plop")
-        response_get = self.client.get(
+        response = self.client.get(
             reverse("accounting:journal_nature_statement", args=[self.journal.id])
         )
-        self.assertTrue(
-            "bob (Troll Pench\\xc3\\xa9) : 3.00" in str(response_get.content)
-        )
+        self.assertContains(response, "bob (Troll Penché) : 3.00", status_code=200)
 
     def test_person_statement(self):
         self.client.login(username="comptable", password="plop")
-        response_get = self.client.get(
+        response = self.client.get(
             reverse("accounting:journal_person_statement", args=[self.journal.id])
         )
-        self.assertTrue(
-            "<td>3.00</td>" in str(response_get.content)
-            and '<td><a href="/user/1/">S&#39; Kia</a></td>'
-            in str(response_get.content)
+        self.assertContains(response, "Total : 5575.72", status_code=200)
+        self.assertContains(response, "Total : 71.42")
+        self.assertContains(
+            response,
+            """
+                <td><a href="/user/1/">S&#39; Kia</a></td>
+                
+                <td>3.00</td>""",
+        )
+        self.assertContains(
+            response,
+            """
+                <td><a href="/user/1/">S&#39; Kia</a></td>
+                
+                <td>823.00</td>""",
         )
 
     def test_accounting_statement(self):
         self.client.login(username="comptable", password="plop")
-        response_get = self.client.get(
+        response = self.client.get(
             reverse("accounting:journal_accounting_statement", args=[self.journal.id])
         )
-        self.assertTrue(
-            "<td>443 - Cr\\xc3\\xa9dit - Ce code n&#39;existe pas</td>"
-            in str(response_get.content)
+        self.assertContains(
+            response,
+            """
+            <tr>
+                <td>443 - Crédit - Ce code n&#39;existe pas</td>
+                <td>3.00</td>
+            </tr>""",
+            status_code=200,
+        )
+        self.assertContains(
+            response,
+            """
+    <p><strong>Montant : </strong>-5504.30 €</p>
+    <p><strong>Montant effectif: </strong>-5504.30 €</p>""",
         )

accounting/urls.py

@@ -22,131 +22,133 @@
 #
 #
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from accounting.views import *
 
 urlpatterns = [
     # Accounting types
-    url(
+    re_path(
         r"^simple_type$",
         SimplifiedAccountingTypeListView.as_view(),
         name="simple_type_list",
     ),
-    url(
+    re_path(
         r"^simple_type/create$",
         SimplifiedAccountingTypeCreateView.as_view(),
         name="simple_type_new",
     ),
-    url(
+    re_path(
         r"^simple_type/(?P<type_id>[0-9]+)/edit$",
         SimplifiedAccountingTypeEditView.as_view(),
         name="simple_type_edit",
     ),
     # Accounting types
-    url(r"^type$", AccountingTypeListView.as_view(), name="type_list"),
-    url(r"^type/create$", AccountingTypeCreateView.as_view(), name="type_new"),
-    url(
+    re_path(r"^type$", AccountingTypeListView.as_view(), name="type_list"),
+    re_path(r"^type/create$", AccountingTypeCreateView.as_view(), name="type_new"),
+    re_path(
         r"^type/(?P<type_id>[0-9]+)/edit$",
         AccountingTypeEditView.as_view(),
         name="type_edit",
     ),
     # Bank accounts
-    url(r"^$", BankAccountListView.as_view(), name="bank_list"),
-    url(r"^bank/create$", BankAccountCreateView.as_view(), name="bank_new"),
-    url(
+    re_path(r"^$", BankAccountListView.as_view(), name="bank_list"),
+    re_path(r"^bank/create$", BankAccountCreateView.as_view(), name="bank_new"),
+    re_path(
         r"^bank/(?P<b_account_id>[0-9]+)$",
         BankAccountDetailView.as_view(),
         name="bank_details",
     ),
-    url(
+    re_path(
         r"^bank/(?P<b_account_id>[0-9]+)/edit$",
         BankAccountEditView.as_view(),
         name="bank_edit",
     ),
-    url(
+    re_path(
         r"^bank/(?P<b_account_id>[0-9]+)/delete$",
         BankAccountDeleteView.as_view(),
         name="bank_delete",
     ),
     # Club accounts
-    url(r"^club/create$", ClubAccountCreateView.as_view(), name="club_new"),
-    url(
+    re_path(r"^club/create$", ClubAccountCreateView.as_view(), name="club_new"),
+    re_path(
         r"^club/(?P<c_account_id>[0-9]+)$",
         ClubAccountDetailView.as_view(),
         name="club_details",
     ),
-    url(
+    re_path(
         r"^club/(?P<c_account_id>[0-9]+)/edit$",
         ClubAccountEditView.as_view(),
         name="club_edit",
     ),
-    url(
+    re_path(
         r"^club/(?P<c_account_id>[0-9]+)/delete$",
         ClubAccountDeleteView.as_view(),
         name="club_delete",
     ),
     # Journals
-    url(r"^journal/create$", JournalCreateView.as_view(), name="journal_new"),
-    url(
+    re_path(r"^journal/create$", JournalCreateView.as_view(), name="journal_new"),
+    re_path(
         r"^journal/(?P<j_id>[0-9]+)$",
         JournalDetailView.as_view(),
         name="journal_details",
     ),
-    url(
+    re_path(
         r"^journal/(?P<j_id>[0-9]+)/edit$",
         JournalEditView.as_view(),
         name="journal_edit",
     ),
-    url(
+    re_path(
         r"^journal/(?P<j_id>[0-9]+)/delete$",
         JournalDeleteView.as_view(),
         name="journal_delete",
     ),
-    url(
+    re_path(
         r"^journal/(?P<j_id>[0-9]+)/statement/nature$",
         JournalNatureStatementView.as_view(),
         name="journal_nature_statement",
     ),
-    url(
+    re_path(
         r"^journal/(?P<j_id>[0-9]+)/statement/person$",
         JournalPersonStatementView.as_view(),
         name="journal_person_statement",
     ),
-    url(
+    re_path(
         r"^journal/(?P<j_id>[0-9]+)/statement/accounting$",
         JournalAccountingStatementView.as_view(),
         name="journal_accounting_statement",
     ),
     # Operations
-    url(
+    re_path(
         r"^operation/create/(?P<j_id>[0-9]+)$",
         OperationCreateView.as_view(),
         name="op_new",
     ),
-    url(r"^operation/(?P<op_id>[0-9]+)$", OperationEditView.as_view(), name="op_edit"),
-    url(
+    re_path(
+        r"^operation/(?P<op_id>[0-9]+)$", OperationEditView.as_view(), name="op_edit"
+    ),
+    re_path(
         r"^operation/(?P<op_id>[0-9]+)/pdf$", OperationPDFView.as_view(), name="op_pdf"
     ),
     # Companies
-    url(r"^company/list$", CompanyListView.as_view(), name="co_list"),
-    url(r"^company/create$", CompanyCreateView.as_view(), name="co_new"),
-    url(r"^company/(?P<co_id>[0-9]+)$", CompanyEditView.as_view(), name="co_edit"),
+    re_path(r"^company/list$", CompanyListView.as_view(), name="co_list"),
+    re_path(r"^company/create$", CompanyCreateView.as_view(), name="co_new"),
+    re_path(r"^company/(?P<co_id>[0-9]+)$", CompanyEditView.as_view(), name="co_edit"),
     # Labels
-    url(r"^label/new$", LabelCreateView.as_view(), name="label_new"),
-    url(
+    re_path(r"^label/new$", LabelCreateView.as_view(), name="label_new"),
+    re_path(
         r"^label/(?P<clubaccount_id>[0-9]+)$",
         LabelListView.as_view(),
         name="label_list",
     ),
-    url(
+    re_path(
         r"^label/(?P<label_id>[0-9]+)/edit$", LabelEditView.as_view(), name="label_edit"
     ),
-    url(
+    re_path(
         r"^label/(?P<label_id>[0-9]+)/delete$",
         LabelDeleteView.as_view(),
         name="label_delete",
     ),
     # User account
-    url(r"^refound/account$", RefoundAccountView.as_view(), name="refound_account"),
+    re_path(r"^refound/account$", RefoundAccountView.as_view(), name="refound_account"),
 ]

accounting/views.py

@@ -24,8 +24,8 @@
 
 from django.views.generic import ListView, DetailView
 from django.views.generic.edit import UpdateView, CreateView, DeleteView, FormView
-from django.core.urlresolvers import reverse_lazy, reverse
-from django.utils.translation import ugettext_lazy as _
+from django.urls import reverse_lazy, reverse
+from django.utils.translation import gettext_lazy as _
 from django.forms.models import modelform_factory
 from django.core.exceptions import PermissionDenied, ValidationError
 from django.forms import HiddenInput
@@ -496,7 +496,7 @@ class OperationCreateView(CanCreateMixin, CreateView):
         return ret
 
     def get_context_data(self, **kwargs):
-        """ Add journal to the context """
+        """Add journal to the context"""
         kwargs = super(OperationCreateView, self).get_context_data(**kwargs)
         if self.journal:
             kwargs["object"] = self.journal
@@ -514,7 +514,7 @@ class OperationEditView(CanEditMixin, UpdateView):
     template_name = "accounting/operation_edit.jinja"
 
     def get_context_data(self, **kwargs):
-        """ Add journal to the context """
+        """Add journal to the context"""
         kwargs = super(OperationEditView, self).get_context_data(**kwargs)
         kwargs["object"] = self.object.journal
         return kwargs
@@ -735,7 +735,7 @@ class JournalNatureStatementView(JournalTabsMixin, CanViewMixin, DetailView):
         return statement
 
     def get_context_data(self, **kwargs):
-        """ Add infos to the context """
+        """Add infos to the context"""
         kwargs = super(JournalNatureStatementView, self).get_context_data(**kwargs)
         kwargs["statement"] = self.big_statement()
         return kwargs
@@ -774,7 +774,7 @@ class JournalPersonStatementView(JournalTabsMixin, CanViewMixin, DetailView):
         return sum(self.statement(movement_type).values())
 
     def get_context_data(self, **kwargs):
-        """ Add journal to the context """
+        """Add journal to the context"""
         kwargs = super(JournalPersonStatementView, self).get_context_data(**kwargs)
         kwargs["credit_statement"] = self.statement("CREDIT")
         kwargs["debit_statement"] = self.statement("DEBIT")
@@ -804,7 +804,7 @@ class JournalAccountingStatementView(JournalTabsMixin, CanViewMixin, DetailView)
         return statement
 
     def get_context_data(self, **kwargs):
-        """ Add journal to the context """
+        """Add journal to the context"""
         kwargs = super(JournalAccountingStatementView, self).get_context_data(**kwargs)
         kwargs["statement"] = self.statement()
         return kwargs

api/urls.py

@@ -22,35 +22,37 @@
 #
 #
 
-from django.conf.urls import url, include
+from django.urls import re_path, path, include
 
 from api.views import *
 from rest_framework import routers
 
 # Router config
 router = routers.DefaultRouter()
-router.register(r"counter", CounterViewSet, base_name="api_counter")
-router.register(r"user", UserViewSet, base_name="api_user")
-router.register(r"club", ClubViewSet, base_name="api_club")
-router.register(r"group", GroupViewSet, base_name="api_group")
+router.register(r"counter", CounterViewSet, basename="api_counter")
+router.register(r"user", UserViewSet, basename="api_user")
+router.register(r"club", ClubViewSet, basename="api_club")
+router.register(r"group", GroupViewSet, basename="api_group")
 
 # Launderette
 router.register(
-    r"launderette/place", LaunderettePlaceViewSet, base_name="api_launderette_place"
+    r"launderette/place", LaunderettePlaceViewSet, basename="api_launderette_place"
 )
 router.register(
     r"launderette/machine",
     LaunderetteMachineViewSet,
-    base_name="api_launderette_machine",
+    basename="api_launderette_machine",
 )
 router.register(
-    r"launderette/token", LaunderetteTokenViewSet, base_name="api_launderette_token"
+    r"launderette/token", LaunderetteTokenViewSet, basename="api_launderette_token"
 )
 
 urlpatterns = [
     # API
-    url(r"^", include(router.urls)),
-    url(r"^login/", include("rest_framework.urls", namespace="rest_framework")),
-    url(r"^markdown$", RenderMarkdown, name="api_markdown"),
-    url(r"^mailings$", FetchMailingLists, name="mailings_fetch"),
+    re_path(r"^", include(router.urls)),
+    re_path(r"^login/", include("rest_framework.urls", namespace="rest_framework")),
+    re_path(r"^markdown$", RenderMarkdown, name="api_markdown"),
+    re_path(r"^mailings$", FetchMailingLists, name="mailings_fetch"),
+    re_path(r"^uv$", uv_endpoint, name="uv_endpoint"),
+    path("sas/<int:user>", all_pictures_of_user_endpoint, name="all_pictures_of_user"),
 ]

api/views/__init__.py

@@ -25,7 +25,7 @@
 from rest_framework.response import Response
 from rest_framework import viewsets
 from django.core.exceptions import PermissionDenied
-from rest_framework.decorators import detail_route
+from rest_framework.decorators import action
 from django.db.models.query import QuerySet
 
 from core.views import can_view, can_edit
@@ -33,8 +33,8 @@ from core.views import can_view, can_edit
 
 def check_if(obj, user, test):
     """
-        Detect if it's a single object or a queryset
-        aply a given test on individual object and return global permission
+    Detect if it's a single object or a queryset
+    aply a given test on individual object and return global permission
     """
     if isinstance(obj, QuerySet):
         for o in obj:
@@ -46,10 +46,10 @@ def check_if(obj, user, test):
 
 
 class ManageModelMixin:
-    @detail_route()
+    @action(detail=True)
     def id(self, request, pk=None):
         """
-            Get by id (api/v1/router/{pk}/id/)
+        Get by id (api/v1/router/{pk}/id/)
         """
         self.queryset = get_object_or_404(self.queryset.filter(id=pk))
         serializer = self.get_serializer(self.queryset)
@@ -77,3 +77,5 @@ from .user import *
 from .club import *
 from .group import *
 from .launderette import *
+from .uv import *
+from .sas import *

api/views/api.py

@@ -25,7 +25,6 @@
 from rest_framework.response import Response
 from rest_framework.decorators import api_view, renderer_classes
 from rest_framework.renderers import StaticHTMLRenderer
-from rest_framework.views import APIView
 
 from core.templatetags.renderer import markdown
 
@@ -34,7 +33,7 @@ from core.templatetags.renderer import markdown
 @renderer_classes((StaticHTMLRenderer,))
 def RenderMarkdown(request):
     """
-        Render Markdown
+    Render Markdown
     """
     try:
         data = markdown(request.POST["text"])

api/views/club.py

@@ -43,7 +43,7 @@ class ClubSerializer(serializers.ModelSerializer):
 
 class ClubViewSet(RightModelViewSet):
     """
-        Manage Clubs (api/v1/club/)
+    Manage Clubs (api/v1/club/)
     """
 
     serializer_class = ClubSerializer

api/views/counter.py

@@ -24,7 +24,7 @@
 
 from rest_framework import serializers
 from rest_framework.response import Response
-from rest_framework.decorators import list_route
+from rest_framework.decorators import action
 
 from counter.models import Counter
 
@@ -45,16 +45,16 @@ class CounterSerializer(serializers.ModelSerializer):
 
 class CounterViewSet(RightModelViewSet):
     """
-        Manage Counters (api/v1/counter/)
+    Manage Counters (api/v1/counter/)
     """
 
     serializer_class = CounterSerializer
     queryset = Counter.objects.all()
 
-    @list_route()
+    @action(detail=False)
     def bar(self, request):
         """
-            Return all bars (api/v1/counter/bar/)
+        Return all bars (api/v1/counter/bar/)
         """
         self.queryset = self.queryset.filter(type="BAR")
         serializer = self.get_serializer(self.queryset, many=True)

api/views/group.py

@@ -36,7 +36,7 @@ class GroupSerializer(serializers.ModelSerializer):
 
 class GroupViewSet(RightModelViewSet):
     """
-        Manage Groups (api/v1/group/)
+    Manage Groups (api/v1/group/)
     """
 
     serializer_class = GroupSerializer

api/views/launderette.py

@@ -24,7 +24,7 @@
 
 from rest_framework import serializers
 from rest_framework.response import Response
-from rest_framework.decorators import list_route
+from rest_framework.decorators import action
 
 from launderette.models import Launderette, Machine, Token
 
@@ -72,7 +72,7 @@ class LaunderetteTokenSerializer(serializers.ModelSerializer):
 
 class LaunderettePlaceViewSet(RightModelViewSet):
     """
-        Manage Launderette (api/v1/launderette/place/)
+    Manage Launderette (api/v1/launderette/place/)
     """
 
     serializer_class = LaunderettePlaceSerializer
@@ -81,7 +81,7 @@ class LaunderettePlaceViewSet(RightModelViewSet):
 
 class LaunderetteMachineViewSet(RightModelViewSet):
     """
-        Manage Washing Machines (api/v1/launderette/machine/)
+    Manage Washing Machines (api/v1/launderette/machine/)
     """
 
     serializer_class = LaunderetteMachineSerializer
@@ -90,34 +90,34 @@ class LaunderetteMachineViewSet(RightModelViewSet):
 
 class LaunderetteTokenViewSet(RightModelViewSet):
     """
-        Manage Launderette's tokens (api/v1/launderette/token/)
+    Manage Launderette's tokens (api/v1/launderette/token/)
     """
 
     serializer_class = LaunderetteTokenSerializer
     queryset = Token.objects.all()
 
-    @list_route()
+    @action(detail=False)
     def washing(self, request):
         """
-            Return all washing tokens (api/v1/launderette/token/washing)
+        Return all washing tokens (api/v1/launderette/token/washing)
         """
         self.queryset = self.queryset.filter(type="WASHING")
         serializer = self.get_serializer(self.queryset, many=True)
         return Response(serializer.data)
 
-    @list_route()
+    @action(detail=False)
     def drying(self, request):
         """
-            Return all drying tokens (api/v1/launderette/token/drying)
+        Return all drying tokens (api/v1/launderette/token/drying)
         """
         self.queryset = self.queryset.filter(type="DRYING")
         serializer = self.get_serializer(self.queryset, many=True)
         return Response(serializer.data)
 
-    @list_route()
+    @action(detail=False)
     def avaliable(self, request):
         """
-            Return all avaliable tokens (api/v1/launderette/token/avaliable)
+        Return all avaliable tokens (api/v1/launderette/token/avaliable)
         """
         self.queryset = self.queryset.filter(
             borrow_date__isnull=True, user__isnull=True
@@ -125,10 +125,10 @@ class LaunderetteTokenViewSet(RightModelViewSet):
         serializer = self.get_serializer(self.queryset, many=True)
         return Response(serializer.data)
 
-    @list_route()
+    @action(detail=False)
     def unavaliable(self, request):
         """
-            Return all unavaliable tokens (api/v1/launderette/token/unavaliable)
+        Return all unavaliable tokens (api/v1/launderette/token/unavaliable)
         """
         self.queryset = self.queryset.filter(
             borrow_date__isnull=False, user__isnull=False

api/views/sas.py

@@ -0,0 +1,42 @@
+from typing import List
+from rest_framework.decorators import api_view, renderer_classes
+from rest_framework.exceptions import PermissionDenied
+from rest_framework.generics import get_object_or_404
+from rest_framework.renderers import JSONRenderer
+from rest_framework.request import Request
+from rest_framework.response import Response
+
+from core.views import can_edit
+from core.models import User
+from sas.models import Picture
+
+
+def all_pictures_of_user(user: User) -> List[Picture]:
+    return [
+        relation.picture
+        for relation in user.pictures.exclude(picture=None)
+        .order_by("-picture__parent__date", "id")
+        .select_related("picture__parent")
+    ]
+
+
+@api_view(["GET"])
+@renderer_classes((JSONRenderer,))
+def all_pictures_of_user_endpoint(request: Request, user: int):
+    requested_user: User = get_object_or_404(User, pk=user)
+    if not can_edit(requested_user, request.user):
+        raise PermissionDenied
+
+    return Response(
+        [
+            {
+                "name": f"{picture.parent.name} - {picture.name}",
+                "date": picture.date,
+                "author": str(picture.owner),
+                "full_size_url": picture.get_download_url(),
+                "compressed_url": picture.get_download_compressed_url(),
+                "thumb_url": picture.get_download_thumb_url(),
+            }
+            for picture in all_pictures_of_user(requested_user)
+        ]
+    )

api/views/user.py

@@ -26,7 +26,7 @@ import datetime
 
 from rest_framework import serializers
 from rest_framework.response import Response
-from rest_framework.decorators import list_route
+from rest_framework.decorators import action
 
 from core.models import User
 
@@ -50,17 +50,17 @@ class UserSerializer(serializers.ModelSerializer):
 
 class UserViewSet(RightModelViewSet):
     """
-        Manage Users (api/v1/user/)
-        Only show active users
+    Manage Users (api/v1/user/)
+    Only show active users
     """
 
     serializer_class = UserSerializer
     queryset = User.objects.filter(is_active=True)
 
-    @list_route()
+    @action(detail=False)
     def birthday(self, request):
         """
-            Return all users born today (api/v1/user/birstdays)
+        Return all users born today (api/v1/user/birstdays)
         """
         date = datetime.datetime.today()
         self.queryset = self.queryset.filter(date_of_birth=date)

api/views/uv.py

@@ -0,0 +1,127 @@
+from rest_framework.response import Response
+from rest_framework.decorators import api_view, renderer_classes
+from rest_framework.renderers import JSONRenderer
+from django.core.exceptions import PermissionDenied
+from django.conf import settings
+from rest_framework import serializers
+import urllib.request
+import json
+
+from pedagogy.views import CanCreateUVFunctionMixin
+
+
+@api_view(["GET"])
+@renderer_classes((JSONRenderer,))
+def uv_endpoint(request):
+    if not CanCreateUVFunctionMixin.can_create_uv(request.user):
+        raise PermissionDenied
+
+    params = request.query_params
+    if "year" not in params or "code" not in params:
+        raise serializers.ValidationError("Missing query parameter")
+
+    short_uv, full_uv = find_uv("fr", params["year"], params["code"])
+    if short_uv is None or full_uv is None:
+        return Response(status=204)
+
+    return Response(make_clean_uv(short_uv, full_uv))
+
+
+def find_uv(lang, year, code):
+    """
+    Uses the UTBM API to find an UV.
+    short_uv is the UV entry in the UV list. It is returned as it contains
+    information which are not in full_uv.
+    full_uv is the detailed representation of an UV.
+    """
+    # query the UV list
+    uvs_url = settings.SITH_PEDAGOGY_UTBM_API + "/uvs/{}/{}".format(lang, year)
+    response = urllib.request.urlopen(uvs_url)
+    uvs = json.loads(response.read().decode("utf-8"))
+
+    try:
+        # find the first UV which matches the code
+        short_uv = next(uv for uv in uvs if uv["code"] == code)
+    except StopIteration:
+        return (None, None)
+
+    # get detailed information about the UV
+    uv_url = settings.SITH_PEDAGOGY_UTBM_API + "/uv/{}/{}/{}/{}".format(
+        lang, year, code, short_uv["codeFormation"]
+    )
+    response = urllib.request.urlopen(uv_url)
+    full_uv = json.loads(response.read().decode("utf-8"))
+
+    return (short_uv, full_uv)
+
+
+def make_clean_uv(short_uv, full_uv):
+    """
+    Cleans the data up so that it corresponds to our data representation.
+    """
+    res = {}
+
+    res["credit_type"] = short_uv["codeCategorie"]
+
+    # probably wrong on a few UVs as we pick the first UV we find but
+    # availability depends on the formation
+    semesters = {
+        (True, True): "AUTUMN_AND_SPRING",
+        (True, False): "AUTUMN",
+        (False, True): "SPRING",
+    }
+    res["semester"] = semesters.get(
+        (short_uv["ouvertAutomne"], short_uv["ouvertPrintemps"]), "CLOSED"
+    )
+
+    langs = {"es": "SP", "en": "EN", "de": "DE"}
+    res["language"] = langs.get(full_uv["codeLangue"], "FR")
+
+    if full_uv["departement"] == "Pôle Humanités":
+        res["department"] = "HUMA"
+    else:
+        departments = {
+            "AL": "IMSI",
+            "AE": "EE",
+            "GI": "GI",
+            "GC": "EE",
+            "GM": "MC",
+            "TC": "TC",
+            "GP": "IMSI",
+            "ED": "EDIM",
+            "AI": "GI",
+            "AM": "MC",
+        }
+        res["department"] = departments.get(full_uv["codeFormation"], "NA")
+
+    res["credits"] = full_uv["creditsEcts"]
+
+    activities = ("CM", "TD", "TP", "THE", "TE")
+    for activity in activities:
+        res["hours_{}".format(activity)] = 0
+    for activity in full_uv["activites"]:
+        if activity["code"] in activities:
+            res["hours_{}".format(activity["code"])] += activity["nbh"] // 60
+
+    # wrong if the manager changes depending on the semester
+    semester = full_uv.get("automne", None)
+    if not semester:
+        semester = full_uv.get("printemps", {})
+    res["manager"] = semester.get("responsable", "")
+
+    res["title"] = full_uv["libelle"]
+
+    descriptions = {
+        "objectives": "objectifs",
+        "program": "programme",
+        "skills": "acquisitionCompetences",
+        "key_concepts": "acquisitionNotions",
+    }
+
+    for res_key, full_uv_key in descriptions.items():
+        res[res_key] = full_uv[full_uv_key]
+        # if not found or the API did not return a string
+        if type(res[res_key]) != str:
+            res[res_key] = ""
+
+    return res

club/forms.py

@@ -0,0 +1,297 @@
+# -*- coding:utf-8 -*
+#
+# Copyright 2016,2017
+# - Skia <skia@libskia.so>
+# - Sli <antoine@bartuccio.fr>
+#
+# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# http://ae.utbm.fr.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License a published by the Free Software
+# Foundation; either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+
+from django.conf import settings
+from django import forms
+from django.utils.translation import gettext_lazy as _
+
+from ajax_select.fields import AutoCompleteSelectField, AutoCompleteSelectMultipleField
+
+from club.models import Mailing, MailingSubscription, Club, Membership
+
+from core.models import User
+from core.views.forms import SelectDate, SelectDateTime
+from counter.models import Counter
+from core.views.forms import TzAwareDateTimeField
+
+
+class ClubEditForm(forms.ModelForm):
+    class Meta:
+        model = Club
+        fields = ["address", "logo", "short_description"]
+
+    def __init__(self, *args, **kwargs):
+        super(ClubEditForm, self).__init__(*args, **kwargs)
+        self.fields["short_description"].widget = forms.Textarea()
+
+
+class MailingForm(forms.Form):
+    """
+    Form handling mailing lists right
+    """
+
+    ACTION_NEW_MAILING = 1
+    ACTION_NEW_SUBSCRIPTION = 2
+    ACTION_REMOVE_SUBSCRIPTION = 3
+
+    subscription_users = AutoCompleteSelectMultipleField(
+        "users",
+        label=_("Users to add"),
+        help_text=_("Search users to add (one or more)."),
+        required=False,
+    )
+
+    def __init__(self, club_id, user_id, mailings, *args, **kwargs):
+        super(MailingForm, self).__init__(*args, **kwargs)
+
+        self.fields["action"] = forms.TypedChoiceField(
+            choices=(
+                (self.ACTION_NEW_MAILING, _("New Mailing")),
+                (self.ACTION_NEW_SUBSCRIPTION, _("Subscribe")),
+                (self.ACTION_REMOVE_SUBSCRIPTION, _("Remove")),
+            ),
+            coerce=int,
+            label=_("Action"),
+            initial=1,
+            required=True,
+            widget=forms.HiddenInput(),
+        )
+
+        # Generate bulk removal forms, they are never required
+        for mailing in mailings:
+            self.fields["removal_" + str(mailing.id)] = forms.ModelMultipleChoiceField(
+                mailing.subscriptions.all(),
+                label=_("Remove"),
+                required=False,
+                widget=forms.CheckboxSelectMultiple,
+            )
+
+        # Include fields for handling mailing creation
+        mailing_fields = ("email",)
+        self.fields.update(forms.fields_for_model(Mailing, fields=mailing_fields))
+        for field in mailing_fields:
+            self.fields["mailing_" + field] = self.fields.pop(field)
+            self.fields["mailing_" + field].required = False
+
+        # Include fields for handling subscription creation
+        subscription_fields = ("mailing", "email")
+        self.fields.update(
+            forms.fields_for_model(MailingSubscription, fields=subscription_fields)
+        )
+        for field in subscription_fields:
+            self.fields["subscription_" + field] = self.fields.pop(field)
+            self.fields["subscription_" + field].required = False
+
+        self.fields["subscription_mailing"].queryset = Mailing.objects.filter(
+            club__id=club_id, is_moderated=True
+        )
+
+    def check_required(self, cleaned_data, field):
+        """
+        If the given field doesn't exist or has no value, add a required error on it
+        """
+        if not cleaned_data.get(field, None):
+            self.add_error(field, _("This field is required"))
+
+    def clean_subscription_users(self):
+        """
+        Convert given users into real users and check their validity
+        """
+        cleaned_data = super(MailingForm, self).clean()
+        users = []
+        for user in cleaned_data["subscription_users"]:
+            user = User.objects.filter(id=user).first()
+            if not user:
+                raise forms.ValidationError(
+                    _("One of the selected users doesn't exist"), code="invalid"
+                )
+            if not user.email:
+                raise forms.ValidationError(
+                    _("One of the selected users doesn't have an email address"),
+                    code="invalid",
+                )
+            users.append(user)
+        return users
+
+    def clean(self):
+        cleaned_data = super(MailingForm, self).clean()
+
+        if not "action" in cleaned_data:
+            # If there is no action provided, we can stop here
+            raise forms.ValidationError(_("An action is required"), code="invalid")
+
+        if cleaned_data["action"] == self.ACTION_NEW_MAILING:
+            self.check_required(cleaned_data, "mailing_email")
+
+        if cleaned_data["action"] == self.ACTION_NEW_SUBSCRIPTION:
+            self.check_required(cleaned_data, "subscription_mailing")
+            if not cleaned_data.get(
+                "subscription_users", None
+            ) and not cleaned_data.get("subscription_email", None):
+                raise forms.ValidationError(
+                    _("You must specify at least an user or an email address"),
+                    code="invalid",
+                )
+
+        return cleaned_data
+
+
+class SellingsForm(forms.Form):
+    begin_date = TzAwareDateTimeField(label=_("Begin date"), required=False)
+    end_date = TzAwareDateTimeField(label=_("End date"), required=False)
+
+    counters = forms.ModelMultipleChoiceField(
+        Counter.objects.order_by("name").all(), label=_("Counter"), required=False
+    )
+
+    def __init__(self, club, *args, **kwargs):
+
+        super(SellingsForm, self).__init__(*args, **kwargs)
+        self.fields["products"] = forms.ModelMultipleChoiceField(
+            club.products.order_by("name").filter(archived=False).all(),
+            label=_("Products"),
+            required=False,
+        )
+        self.fields["archived_products"] = forms.ModelMultipleChoiceField(
+            club.products.order_by("name").filter(archived=True).all(),
+            label=_("Archived products"),
+            required=False,
+        )
+
+
+class ClubMemberForm(forms.Form):
+    """
+    Form handling the members of a club
+    """
+
+    error_css_class = "error"
+    required_css_class = "required"
+
+    users = AutoCompleteSelectMultipleField(
+        "users",
+        label=_("Users to add"),
+        help_text=_("Search users to add (one or more)."),
+        required=False,
+    )
+
+    def __init__(self, *args, **kwargs):
+        self.club = kwargs.pop("club")
+        self.request_user = kwargs.pop("request_user")
+        self.club_members = kwargs.pop("club_members", None)
+        if not self.club_members:
+            self.club_members = (
+                self.club.members.filter(end_date=None).order_by("-role").all()
+            )
+        self.request_user_membership = self.club.get_membership_for(self.request_user)
+        super(ClubMemberForm, self).__init__(*args, **kwargs)
+
+        # Using a ModelForm binds too much the form with the model and we don't want that
+        # We want the view to process the model creation since they are multiple users
+        # We also want the form to handle bulk deletion
+        self.fields.update(
+            forms.fields_for_model(
+                Membership,
+                fields=("role", "start_date", "description"),
+                widgets={"start_date": SelectDate},
+            )
+        )
+
+        # Role is required only if users is specified
+        self.fields["role"].required = False
+
+        # Start date and description are never really required
+        self.fields["start_date"].required = False
+        self.fields["description"].required = False
+
+        self.fields["users_old"] = forms.ModelMultipleChoiceField(
+            User.objects.filter(
+                id__in=[
+                    ms.user.id
+                    for ms in self.club_members
+                    if ms.can_be_edited_by(
+                        self.request_user, self.request_user_membership
+                    )
+                ]
+            ).all(),
+            label=_("Mark as old"),
+            required=False,
+            widget=forms.CheckboxSelectMultiple,
+        )
+        if not self.request_user.is_root:
+            self.fields.pop("start_date")
+
+    def clean_users(self):
+        """
+        Check that the user is not trying to add an user already in the club
+        Also check that the user is valid and has a valid subscription
+        """
+        cleaned_data = super(ClubMemberForm, self).clean()
+        users = []
+        for user_id in cleaned_data["users"]:
+            user = User.objects.filter(id=user_id).first()
+            if not user:
+                raise forms.ValidationError(
+                    _("One of the selected users doesn't exist"), code="invalid"
+                )
+            if not user.is_subscribed:
+                raise forms.ValidationError(
+                    _("User must be subscriber to take part to a club"), code="invalid"
+                )
+            if self.club.get_membership_for(user):
+                raise forms.ValidationError(
+                    _("You can not add the same user twice"), code="invalid"
+                )
+            users.append(user)
+        return users
+
+    def clean(self):
+        """
+        Check user rights for adding an user
+        """
+        cleaned_data = super(ClubMemberForm, self).clean()
+
+        if "start_date" in cleaned_data and not cleaned_data["start_date"]:
+            # Drop start_date if allowed to edition but not specified
+            cleaned_data.pop("start_date")
+
+        if not cleaned_data.get("users"):
+            # No user to add equals no check needed
+            return cleaned_data
+
+        if cleaned_data.get("role", "") == "":
+            # Role is required if users exists
+            self.add_error("role", _("You should specify a role"))
+            return cleaned_data
+
+        request_user = self.request_user
+        membership = self.request_user_membership
+        if not (
+            cleaned_data["role"] <= settings.SITH_MAXIMUM_FREE_ROLE
+            or (membership is not None and membership.role >= cleaned_data["role"])
+            or request_user.is_board_member
+            or request_user.is_root
+        ):
+            raise forms.ValidationError(_("You do not have the permission to do that"))
+        return cleaned_data

club/migrations/0001_initial.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 import django.core.validators
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -90,7 +91,10 @@ class Migration(migrations.Migration):
                 (
                     "club",
                     models.ForeignKey(
-                        verbose_name="club", to="club.Club", related_name="members"
+                        verbose_name="club",
+                        to="club.Club",
+                        related_name="members",
+                        on_delete=django.db.models.deletion.CASCADE,
                     ),
                 ),
             ],

club/migrations/0002_auto_20160824_2152.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -18,6 +19,7 @@ class Migration(migrations.Migration):
             model_name="membership",
             name="user",
             field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
                 verbose_name="user",
                 to=settings.AUTH_USER_MODEL,
                 related_name="membership",
@@ -34,6 +36,7 @@ class Migration(migrations.Migration):
             model_name="club",
             name="home",
             field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
                 blank=True,
                 null=True,
                 related_name="home_of_club",
@@ -45,14 +48,21 @@ class Migration(migrations.Migration):
             model_name="club",
             name="owner_group",
             field=models.ForeignKey(
-                default=1, to="core.Group", related_name="owned_club"
+                on_delete=django.db.models.deletion.CASCADE,
+                default=1,
+                to="core.Group",
+                related_name="owned_club",
             ),
         ),
         migrations.AddField(
             model_name="club",
             name="parent",
             field=models.ForeignKey(
-                null=True, to="club.Club", related_name="children", blank=True
+                on_delete=django.db.models.deletion.CASCADE,
+                null=True,
+                to="club.Club",
+                related_name="children",
+                blank=True,
             ),
         ),
         migrations.AddField(

club/migrations/0004_auto_20160915_1057.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,6 +15,7 @@ class Migration(migrations.Migration):
             model_name="membership",
             name="user",
             field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
                 verbose_name="user",
                 related_name="memberships",
                 to=settings.AUTH_USER_MODEL,

club/migrations/0009_auto_20170822_2232.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 from django.conf import settings
 import re
 import django.core.validators
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -51,12 +52,16 @@ class Migration(migrations.Migration):
                 (
                     "club",
                     models.ForeignKey(
-                        verbose_name="Club", related_name="mailings", to="club.Club"
+                        on_delete=django.db.models.deletion.CASCADE,
+                        verbose_name="Club",
+                        related_name="mailings",
+                        to="club.Club",
                     ),
                 ),
                 (
                     "moderator",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         null=True,
                         verbose_name="moderator",
                         related_name="moderated_mailings",
@@ -84,6 +89,7 @@ class Migration(migrations.Migration):
                 (
                     "mailing",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         verbose_name="Mailing",
                         related_name="subscriptions",
                         to="club.Mailing",
@@ -92,6 +98,7 @@ class Migration(migrations.Migration):
                 (
                     "user",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         null=True,
                         verbose_name="User",
                         related_name="mailing_subscriptions",

club/migrations/0010_auto_20170912_2028.py

@@ -5,6 +5,7 @@ from django.db import migrations, models
 
 from club.models import Club
 from core.operations import PsqlRunOnly
+import django.db.models.deletion
 
 
 def generate_club_pages(apps, schema_editor):
@@ -31,7 +32,11 @@ class Migration(migrations.Migration):
             model_name="club",
             name="page",
             field=models.OneToOneField(
-                related_name="club", blank=True, null=True, to="core.Page"
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="club",
+                blank=True,
+                null=True,
+                to="core.Page",
             ),
         ),
         migrations.AddField(

club/migrations/0011_auto_20180426_2013.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 import club.models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,6 +15,7 @@ class Migration(migrations.Migration):
             model_name="club",
             name="owner_group",
             field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
                 default=club.models.Club.get_default_owner_group,
                 related_name="owned_club",
                 to="core.Group",

club/models.py

@@ -26,10 +26,10 @@
 from django.db import models
 from django.core import validators
 from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.core.exceptions import ValidationError, ObjectDoesNotExist
 from django.db import transaction
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils import timezone
 from django.core.validators import RegexValidator, validate_email
 from django.utils.functional import cached_property
@@ -46,7 +46,9 @@ class Club(models.Model):
 
     id = models.AutoField(primary_key=True, db_index=True)
     name = models.CharField(_("name"), max_length=64)
-    parent = models.ForeignKey("Club", related_name="children", null=True, blank=True)
+    parent = models.ForeignKey(
+        "Club", related_name="children", null=True, blank=True, on_delete=models.CASCADE
+    )
     unix_name = models.CharField(
         _("unix name"),
         max_length=30,
@@ -75,7 +77,10 @@ class Club(models.Model):
         return settings.SITH_GROUP_ROOT_ID
 
     owner_group = models.ForeignKey(
-        Group, related_name="owned_club", default=get_default_owner_group
+        Group,
+        related_name="owned_club",
+        default=get_default_owner_group,
+        on_delete=models.CASCADE,
     )
     edit_groups = models.ManyToManyField(
         Group, related_name="editable_club", blank=True
@@ -91,7 +96,9 @@ class Club(models.Model):
         blank=True,
         on_delete=models.SET_NULL,
     )
-    page = models.OneToOneField(Page, related_name="club", blank=True, null=True)
+    page = models.OneToOneField(
+        Page, related_name="club", blank=True, null=True, on_delete=models.CASCADE
+    )
 
     class Meta:
         ordering = ["name", "unix_name"]
@@ -183,8 +190,8 @@ class Club(models.Model):
                     name=settings.SITH_MAIN_MEMBERS_GROUP
                 ).first()
                 self.make_home()
-                self.home.edit_groups = [board]
-                self.home.view_groups = [member, subscribers]
+                self.home.edit_groups.set([board])
+                self.home.view_groups.set([member, subscribers])
                 self.home.save()
             self.make_page()
 
@@ -261,9 +268,15 @@ class Membership(models.Model):
         related_name="memberships",
         null=False,
         blank=False,
+        on_delete=models.CASCADE,
     )
     club = models.ForeignKey(
-        Club, verbose_name=_("club"), related_name="members", null=False, blank=False
+        Club,
+        verbose_name=_("club"),
+        related_name="members",
+        null=False,
+        blank=False,
+        on_delete=models.CASCADE,
     )
     start_date = models.DateField(_("start date"), default=timezone.now)
     end_date = models.DateField(_("end date"), null=True, blank=True)
@@ -276,18 +289,6 @@ class Membership(models.Model):
         _("description"), max_length=128, null=False, blank=True
     )
 
-    def clean(self):
-        sub = User.objects.filter(pk=self.user.pk).first()
-        if sub is None or not sub.is_subscribed:
-            raise ValidationError(_("User must be subscriber to take part to a club"))
-        if (
-            Membership.objects.filter(user=self.user)
-            .filter(club=self.club)
-            .filter(end_date=None)
-            .exists()
-        ):
-            raise ValidationError(_("User is already member of that club"))
-
     def __str__(self):
         return (
             self.club.name
@@ -304,12 +305,15 @@ class Membership(models.Model):
         """
         return user.is_in_group(settings.SITH_MAIN_BOARD_GROUP)
 
-    def can_be_edited_by(self, user):
+    def can_be_edited_by(self, user, membership=None):
         """
         Method to see if that object can be edited by the given user
         """
         if user.memberships:
-            ms = user.memberships.filter(club=self.club, end_date=None).first()
+            if membership:  # This is for optimisation purpose
+                ms = membership
+            else:
+                ms = user.memberships.filter(club=self.club, end_date=None).first()
             return (ms and ms.role >= self.role) or user.is_in_group(
                 settings.SITH_MAIN_BOARD_GROUP
             )
@@ -326,7 +330,12 @@ class Mailing(models.Model):
     """
 
     club = models.ForeignKey(
-        Club, verbose_name=_("Club"), related_name="mailings", null=False, blank=False
+        Club,
+        verbose_name=_("Club"),
+        related_name="mailings",
+        null=False,
+        blank=False,
+        on_delete=models.CASCADE,
     )
     email = models.CharField(
         _("Email address"),
@@ -343,10 +352,16 @@ class Mailing(models.Model):
     )
     is_moderated = models.BooleanField(_("is moderated"), default=False)
     moderator = models.ForeignKey(
-        User, related_name="moderated_mailings", verbose_name=_("moderator"), null=True
+        User,
+        related_name="moderated_mailings",
+        verbose_name=_("moderator"),
+        null=True,
+        on_delete=models.CASCADE,
     )
 
     def clean(self):
+        if Mailing.objects.filter(email=self.email).exists():
+            raise ValidationError(_("This mailing list already exists."))
         if self.can_moderate(self.moderator):
             self.is_moderated = True
         else:
@@ -416,6 +431,7 @@ class MailingSubscription(models.Model):
         related_name="subscriptions",
         null=False,
         blank=False,
+        on_delete=models.CASCADE,
     )
     user = models.ForeignKey(
         User,
@@ -423,6 +439,7 @@ class MailingSubscription(models.Model):
         related_name="mailing_subscriptions",
         null=True,
         blank=True,
+        on_delete=models.CASCADE,
     )
     email = models.EmailField(_("Email address"), blank=False, null=False)
 
@@ -455,18 +472,20 @@ class MailingSubscription(models.Model):
     def can_be_edited_by(self, user):
         return self.user is not None and user.id == self.user.id
 
-    @property
+    @cached_property
     def get_email(self):
         if self.user and not self.email:
             return self.user.email
         return self.email
 
+    @cached_property
+    def get_username(self):
+        if self.user:
+            return str(self.user)
+        return _("Unregistered user")
+
     def fetch_format(self):
         return self.get_email + " "
 
     def __str__(self):
-        if self.user:
-            user = str(self.user)
-        else:
-            user = _("Unregistered user")
-        return "(%s) - %s : %s" % (self.mailing, user, self.email)
+        return "(%s) - %s : %s" % (self.mailing, self.get_username, self.email)

club/templates/club/club_members.jinja

@@ -1,35 +1,80 @@
 {% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import user_profile_link %}
+{% from 'core/macros.jinja' import user_profile_link, select_all_checkbox %}
 
 {% block content %}
     <h2>{% trans %}Club members{% endtrans %}</h2>
-    <table>
-        <thead>
-            <td>{% trans %}User{% endtrans %}</td>
-            <td>{% trans %}Role{% endtrans %}</td>
-            <td>{% trans %}Description{% endtrans %}</td>
-            <td>{% trans %}Since{% endtrans %}</td>
-        </thead>
-        <tbody>
-        {% for m in club.members.filter(end_date=None).order_by('-role').all() %}
-            <tr>
-                <td>{{ user_profile_link(m.user) }}</td>
-                <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
-                <td>{{ m.description }}</td>
-                <td>{{ m.start_date }}</td>
-                {% if m.can_be_edited_by(user) %}
-                <td><a href="{{ url('club:membership_set_old', membership_id=m.id) }}">{% trans %}Mark as old{% endtrans %}</a></td>
-                {% endif %}
-            </tr>
-        {% endfor %}
-        </tbody>
-    </table>
-    <form action="{{ url('club:club_members', club_id=club.id) }}" method="post">
+    {% if members %}
+    <form action="{{ url('club:club_members', club_id=club.id) }}" id="users_old" method="post">
         {% csrf_token %}
-        {{ form.as_p() }}
+        {% set users_old = dict(form.users_old | groupby("choice_label")) %}
+        {% if users_old %}
+            {{ select_all_checkbox("users_old") }}
+            <p></p>
+        {% endif %}
+        <table>
+            <thead>
+                <td>{% trans %}User{% endtrans %}</td>
+                <td>{% trans %}Role{% endtrans %}</td>
+                <td>{% trans %}Description{% endtrans %}</td>
+                <td>{% trans %}Since{% endtrans %}</td>
+                {% if users_old %}
+                    <td>{% trans %}Mark as old{% endtrans %}</td>
+                {% endif %}
+            </thead>
+            <tbody>
+            {% for m in members %}
+                <tr>
+                    <td>{{ user_profile_link(m.user) }}</td>
+                    <td>{{ settings.SITH_CLUB_ROLES[m.role] }}</td>
+                    <td>{{ m.description }}</td>
+                    <td>{{ m.start_date }}</td>
+                    {% if users_old %}
+                        <td>
+                        {% set user_old = users_old[m.user.get_display_name()] %}
+                        {% if user_old %}
+                            {{ user_old[0].tag() }}
+                        {% endif %}
+                        </td>
+                    {% endif %}
+                </tr>
+            {% endfor %}
+            </tbody>
+        </table>
+        {{ form.users_old.errors }}
+        {% if users_old %}
+            <p></p>
+            <input type="submit" name="submit" value="{% trans %}Mark as old{% endtrans %}">
+        {% endif %}
+    </form>
+    {% else %}
+    <p>{% trans %}There are no members in this club.{% endtrans %}</p>
+    {% endif %}
+    <form action="{{ url('club:club_members', club_id=club.id) }}" id="add_users" method="post">
+        {% csrf_token %}
+        {{ form.non_field_errors() }}
+        <p>
+            {{ form.users.errors }}
+            <label for="{{ form.users.id_for_label }}">{{ form.users.label }} :</label>
+            {{ form.users }}
+            <span class="helptext">{{ form.users.help_text }}</span>
+        </p>
+        <p>
+            {{ form.role.errors }}
+            <label for="{{ form.role.id_for_label }}">{{ form.role.label }} :</label>
+            {{ form.role }}
+        </p>
+        {% if form.start_date %}
+        <p>
+            {{ form.start_date.errors }}
+            <label for="{{ form.start_date.id_for_label }}">{{ form.start_date.label }} :</label>
+            {{ form.start_date }}
+        </p>
+        {% endif %}
+        <p>
+            {{ form.description.errors }}
+            <label for="{{ form.description.id_for_label }}">{{ form.description.label }} :</label>
+            {{ form.description }}
+        </p>
         <p><input type="submit" value="{% trans %}Add{% endtrans %}" /></p>
     </form>
 {% endblock %}
-
-
-

club/templates/club/club_sellings.jinja

@@ -1,9 +1,9 @@
 {% extends "core/base.jinja" %}
-{% from 'core/macros.jinja' import user_profile_link %}
+{% from 'core/macros.jinja' import user_profile_link, paginate %}
 
 {% block content %}
 <h3>{% trans %}Sellings{% endtrans %}</h3>
-<form action="" method="get">
+<form id="form" action="?page=1" method="post">
     {% csrf_token %}
     {{ form }}
     <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
@@ -28,7 +28,7 @@
         </tr>
     </thead>
     <tbody>
-    {% for s in result %}
+    {% for s in paginated_result %}
         <tr>
             <td>{{ s.date|localtime|date(DATETIME_FORMAT) }} {{ s.date|localtime|time(DATETIME_FORMAT) }}</td>
             <td>{{ s.counter }}</td>
@@ -53,6 +53,14 @@
     {% endfor %}
     </tbody>
 </table>
+<script type="text/javascript">
+    function formPagination(link){
+        $("form").attr("action", link.href);
+        link.href = "javascript:void(0)"; // block link action
+        $("form").submit();
+    }
+</script>
+{{ paginate(paginated_result, paginator, "formPagination(this)") }}
 {% endblock %}
 
 

club/templates/club/mailing.jinja

@@ -1,16 +1,25 @@
 {% extends "core/base.jinja" %}
+{% from 'core/macros.jinja' import select_all_checkbox %}
 
 {% block title %}
 {% trans %}Mailing lists{% endtrans %}
 {% endblock %}
 
 {% block content %}
-    {% if has_objects %}
 
     <b>{% trans %}Remember : mailing lists need to be moderated, if your new created list is not shown wait until moderation takes action{% endtrans %}</b>
 
-    {% for mailing in object_list %}
-    {% if mailing.is_moderated %}
+    {% if mailings_not_moderated %}
+        <p>{% trans %}Mailing lists waiting for moderation{% endtrans %}</p>
+        <ul>
+            {% for mailing in mailings_not_moderated %}
+                <li>{{ mailing.email_full }}<a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a></li>
+            {% endfor %}
+        </ul>
+    {% endif %}
+
+    {% if mailings_moderated %}
+    {% for mailing in mailings_moderated %}
     <h2>{% trans %}Mailing{% endtrans %} {{ mailing.email_full }}
         {%- if user.is_owner(mailing) -%}
         <a href="{{ url('club:mailing_delete', mailing_id=mailing.id) }}"> - {% trans %}Delete{% endtrans %}</a>
@@ -19,27 +28,38 @@
     <form method="GET" action="{{ url('club:mailing_generate', mailing_id=mailing.id) }}" style="display:inline-block;">
         <input type="submit" name="generateMalingList" value="{% trans %}Generate mailing list{% endtrans %}">
     </form>
-    <form method="GET" action="{{ url('club:mailing_clean', mailing_id=mailing.id) }}" style="display:inline-block;">
-        <input type="submit" name="cleanMailingList" value="{% trans %}Clean mailing list{% endtrans %}">
+    {% set form_mailing_removal = form["removal_" + mailing.id|string] %}
+    {% if form_mailing_removal.field.choices %}
+    {% set ms = dict(mailing.subscriptions.all() | groupby('id')) %}
+    <form action="{{ url('club:mailing', club_id=club.id) }}" id="{{ form_mailing_removal.auto_id }}" method="post" enctype="multipart/form-data">
+        <p style="margin-bottom: 1em;">{{ select_all_checkbox(form_mailing_removal.auto_id) }}</p>
+        {% csrf_token %}
+        <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.REMOVE_SUBSCRIPTION }}" />
+        <table>
+            <thead>
+                <tr>
+                    <td>{% trans %}User{% endtrans %}</td>
+                    <td>{% trans %}Email{% endtrans %}</td>
+                    <td>{% trans %}Delete{% endtrans %}</td>
+                </tr>
+            </thead>
+            <tbody>
+                {% for widget in form_mailing_removal.subwidgets %}
+                {% set user = ms[widget.data.value.value][0] %}
+                <tr>
+                    <td>{{ user.get_username }}</td>
+                    <td>{{ user.get_email }}</td>
+                    <td>{{ widget.tag() }}</td>
+                </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+        {{ form_mailing_removal.errors }}
+        <p><input type="submit" value="{% trans %}Remove from mailing list{% endtrans %}" /></p>
     </form>
-    <hr>
-    <table>
-        <tr>
-            <th>{% trans %}User{% endtrans %}</th>
-            <th colspan="2">{% trans %}Email{%endtrans%}</th>
-        </tr>
-        {% for subscriber in mailing.subscriptions.all() %}
-        <tr>
-            {% if subscriber.user %}
-            <td>{{ subscriber.user }}</td>
-            {% else %}
-            <td>{% trans %}Unregistered user{% endtrans %}</td>
-            {% endif %}
-            <td>{{ subscriber.get_email }}</td>
-            <td><a href="{{ url('club:mailing_subscription_delete', mailing_subscription_id=subscriber.id) }}">{% trans %}Delete{% endtrans %}</a></td>
-        </tr>
-        {% endfor %}
-    </table>
+
+    {% else %}
+        <p><b>{% trans %}There is no subscriber for this mailing list{% endtrans %}</b></p>
     {% endif %}
     {% endfor %}
 
@@ -47,19 +67,41 @@
     <p>{% trans %}No mailing list existing for this club{% endtrans %}</p>
     {% endif %}
 
-    {% if has_objects %}
+    <p>{{ form.non_field_errors() }}</p>
+    {% if mailings_moderated %}
         <h2>{% trans %}New member{% endtrans %}</h2>
-        <form action="{{ url('club:mailing_subscription_create', club_id=club.id) }}" method="post" enctype="multipart/form-data">
+        <form action="{{ url('club:mailing', club_id=club.id) }}" method="post" enctype="multipart/form-data">
             {% csrf_token %}
-            {{ add_member.as_p() }}
+            <p>
+                {{ form.subscription_mailing.errors }}
+                <label for="{{ form.subscription_mailing.id_for_label }}">{{ form.subscription_mailing.label }}</label>
+                {{ form.subscription_mailing }}
+            </p>
+            <p>
+                {{ form.subscription_users.errors }}
+                <label for="{{ form.subscription_users.id_for_label }}">{{ form.subscription_users.label }}</label>
+                {{ form.subscription_users }}
+                <span class="helptext">{{ form.subscription_users.help_text }}</span>
+            </p>
+            <p>
+                {{ form.subscription_email.errors }}
+                <label for="{{ form.subscription_email.id_for_label }}">{{ form.subscription_email.label }}</label>
+                {{ form.subscription_email }}
+            </p>
+            <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_SUBSCRIPTION }}" />
             <p><input type="submit" value="{% trans %}Add to mailing list{% endtrans %}" /></p>
         </form>
     {% endif %}
 
     <h2>{% trans %}New mailing{% endtrans %}</h2>
-    <form action="{{ url('club:mailing_create', club_id=club.id) }}" method="post" enctype="multipart/form-data">
+    <form action="{{ url('club:mailing', club_id=club.id) }}" method="post" enctype="multipart/form-data">
         {% csrf_token %}
-        {{ add_mailing.as_p() }}
+        <p>
+            {{ form.mailing_email.errors }}
+            <label for="{{ form.mailing_email.id_for_label }}">{{ form.mailing_email.label }}</label>
+            {{ form.mailing_email }}
+        </p>
+        <input hidden type="number" name="{{ form.action.name }}" value="{{ form_actions.NEW_MALING }}" />
         <p><input type="submit" value="{% trans %}Create mailing list{% endtrans %}" /></p>
     </form>
 

club/tests.py

@@ -22,12 +22,17 @@
 #
 #
 
+from django.conf import settings
 from django.test import TestCase
-from django.core.urlresolvers import reverse
+from django.utils import timezone, html
+from django.utils.translation import gettext as _
+from django.urls import reverse
 from django.core.management import call_command
+from django.core.exceptions import ValidationError, NON_FIELD_ERRORS
 
 from core.models import User
-from club.models import Club
+from club.models import Club, Membership, Mailing
+from club.forms import MailingForm
 
 # Create your tests here.
 
@@ -44,30 +49,54 @@ class ClubTest(TestCase):
         self.client.login(username="root", password="plop")
         self.client.post(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
-            {"user": self.skia.id, "start_date": "12/06/2016", "role": 3},
+            {"users": self.skia.id, "start_date": "12/06/2016", "role": 3},
         )
         response = self.client.get(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id})
         )
         self.assertTrue(response.status_code == 200)
         self.assertTrue(
-            "S&#39; Kia</a></td>\\n                <td>Responsable info</td>"
+            "S&#39; Kia</a></td>\\n                    <td>Responsable info</td>"
             in str(response.content)
         )
 
+    def test_create_add_multiple_user_to_club_from_root_ok(self):
+        self.client.login(username="root", password="plop")
+        self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {
+                "users": "|%d|%d|" % (self.skia.id, self.rbatsbak.id),
+                "start_date": "12/06/2016",
+                "role": 3,
+            },
+        )
+        response = self.client.get(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertTrue(response.status_code == 200)
+        content = str(response.content)
+        self.assertTrue(
+            "S&#39; Kia</a></td>\\n                    <td>Responsable info</td>"
+            in content
+        )
+        self.assertTrue(
+            "Richard Batsbak</a></td>\\n                    <td>Responsable info</td>"
+            in content
+        )
+
     def test_create_add_user_to_club_from_root_fail_not_subscriber(self):
         self.client.login(username="root", password="plop")
         response = self.client.post(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
-            {"user": self.guy.id, "start_date": "12/06/2016", "role": 3},
+            {"users": self.guy.id, "start_date": "12/06/2016", "role": 3},
         )
         self.assertTrue(response.status_code == 200)
-        self.assertTrue('<ul class="errorlist nonfield"><li>' in str(response.content))
+        self.assertTrue('<ul class="errorlist"><li>' in str(response.content))
         response = self.client.get(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id})
         )
         self.assertFalse(
-            "Guy Carlier</a></td>\\n                <td>Responsable info</td>"
+            "Guy Carlier</a></td>\\n                    <td>Responsable info</td>"
             in str(response.content)
         )
 
@@ -75,18 +104,18 @@ class ClubTest(TestCase):
         self.client.login(username="root", password="plop")
         self.client.post(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
-            {"user": self.skia.id, "start_date": "12/06/2016", "role": 3},
+            {"users": self.skia.id, "start_date": "12/06/2016", "role": 3},
         )
         response = self.client.get(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id})
         )
         self.assertTrue(
-            "S&#39; Kia</a></td>\\n                <td>Responsable info</td>"
+            "S&#39; Kia</a></td>\\n                    <td>Responsable info</td>"
             in str(response.content)
         )
         response = self.client.post(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
-            {"user": self.skia.id, "start_date": "12/06/2016", "role": 4},
+            {"users": self.skia.id, "start_date": "12/06/2016", "role": 4},
         )
         self.assertTrue(response.status_code == 200)
         self.assertFalse(
@@ -94,39 +123,597 @@ class ClubTest(TestCase):
             in str(response.content)
         )
 
+    def test_create_add_user_non_existent_to_club_from_root_fail(self):
+        self.client.login(username="root", password="plop")
+        response = self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users": [9999], "start_date": "12/06/2016", "role": 3},
+        )
+        self.assertTrue(response.status_code == 200)
+        content = str(response.content)
+        self.assertTrue('<ul class="errorlist"><li>' in content)
+        self.assertFalse("<td>Responsable info</td>" in content)
+        self.client.login(username="root", password="plop")
+        response = self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {
+                "users": "|%d|%d|" % (self.skia.id, 9999),
+                "start_date": "12/06/2016",
+                "role": 3,
+            },
+        )
+        self.assertTrue(response.status_code == 200)
+        content = str(response.content)
+        self.assertTrue('<ul class="errorlist"><li>' in content)
+        self.assertFalse("<td>Responsable info</td>" in content)
+
     def test_create_add_user_to_club_from_skia_ok(self):
         self.client.login(username="root", password="plop")
         self.client.post(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
-            {"user": self.skia.id, "start_date": "12/06/2016", "role": 10},
+            {"users": self.skia.id, "start_date": "12/06/2016", "role": 10},
         )
         self.client.login(username="skia", password="plop")
         self.client.post(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
-            {"user": self.rbatsbak.id, "start_date": "12/06/2016", "role": 9},
+            {"users": self.rbatsbak.id, "start_date": "12/06/2016", "role": 9},
         )
         response = self.client.get(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id})
         )
-        self.assertTrue(response.status_code == 200)
-        self.assertTrue(
-            """Richard Batsbak</a></td>\\n                <td>Vice-Pr\\xc3\\xa9sident</td>"""
-            in str(response.content)
+        self.assertEqual(response.status_code, 200)
+        self.assertIn(
+            """Richard Batsbak</a></td>\n                    <td>Vice-Président⸱e</td>""",
+            response.content.decode(),
         )
 
     def test_create_add_user_to_club_from_richard_fail(self):
         self.client.login(username="root", password="plop")
         self.client.post(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
-            {"user": self.rbatsbak.id, "start_date": "12/06/2016", "role": 3},
+            {"users": self.rbatsbak.id, "start_date": "12/06/2016", "role": 3},
         )
         self.client.login(username="rbatsbak", password="plop")
         response = self.client.post(
             reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
-            {"user": self.skia.id, "start_date": "12/06/2016", "role": 10},
+            {"users": self.skia.id, "start_date": "12/06/2016", "role": 10},
         )
         self.assertTrue(response.status_code == 200)
         self.assertTrue(
-            "<li>Vous n&#39;avez pas la permission de faire cela</li>"
+            "<li>Vous n&#x27;avez pas la permission de faire cela</li>"
             in str(response.content)
         )
+
+    def test_role_required_if_users_specified(self):
+        self.client.login(username="root", password="plop")
+        response = self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users": self.rbatsbak.id, "start_date": "12/06/2016"},
+        )
+        self.assertTrue(
+            '<ul class="errorlist"><li>Vous devez choisir un r' in str(response.content)
+        )
+
+    def test_mark_old_user_to_club_from_skia_ok(self):
+        self.client.login(username="root", password="plop")
+        self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {
+                "users": "|%d|%d|" % (self.skia.id, self.rbatsbak.id),
+                "start_date": "12/06/2016",
+                "role": 3,
+            },
+        )
+        self.client.login(username="skia", password="plop")
+        response = self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users_old": self.rbatsbak.id},
+        )
+        self.assertTrue(response.status_code == 302)
+
+        response = self.client.get(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertTrue(response.status_code == 200)
+        content = str(response.content)
+        self.assertFalse(
+            "Richard Batsbak</a></td>\\n                    <td>Responsable info</td>"
+            in content
+        )
+        self.assertTrue(
+            "S&#39; Kia</a></td>\\n                    <td>Responsable info</td>"
+            in content
+        )
+
+        # Skia is board member so he should be able to mark as old even without being in the club
+        response = self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users_old": self.skia.id},
+        )
+        self.client.login(username="root", password="plop")
+        self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users": self.rbatsbak.id, "start_date": "12/06/2016", "role": 3},
+        )
+        self.client.login(username="skia", password="plop")
+        response = self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users_old": self.rbatsbak.id},
+        )
+        self.assertFalse(
+            "Richard Batsbak</a></td>\\n                    <td>Responsable info</td>"
+            in str(response.content)
+        )
+
+    def test_mark_old_multiple_users_from_skia_ok(self):
+        self.client.login(username="root", password="plop")
+        self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {
+                "users": "|%d|%d|" % (self.skia.id, self.rbatsbak.id),
+                "start_date": "12/06/2016",
+                "role": 3,
+            },
+        )
+        self.client.login(username="skia", password="plop")
+        response = self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users_old": [self.rbatsbak.id, self.skia.id]},
+        )
+        self.assertTrue(response.status_code == 302)
+
+        response = self.client.get(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertTrue(response.status_code == 200)
+        content = str(response.content)
+        self.assertFalse(
+            "Richard Batsbak</a></td>\\n                    <td>Responsable info</td>"
+            in content
+        )
+        self.assertFalse(
+            "S&#39; Kia</a></td>\\n                    <td>Responsable info</td>"
+            in content
+        )
+
+    def test_mark_old_user_to_club_from_richard_ok(self):
+        self.client.login(username="root", password="plop")
+        self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {
+                "users": "|%d|%d|" % (self.skia.id, self.rbatsbak.id),
+                "start_date": "12/06/2016",
+                "role": 3,
+            },
+        )
+
+        # Test with equal rights
+        self.client.login(username="rbatsbak", password="plop")
+        response = self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users_old": self.skia.id},
+        )
+        self.assertTrue(response.status_code == 302)
+
+        response = self.client.get(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertTrue(response.status_code == 200)
+        content = str(response.content)
+        self.assertTrue(
+            "Richard Batsbak</a></td>\\n                    <td>Responsable info</td>"
+            in content
+        )
+        self.assertFalse(
+            "S&#39; Kia</a></td>\\n                    <td>Responsable info</td>"
+            in content
+        )
+
+        # Test with lower rights
+        self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users": self.skia.id, "start_date": "12/06/2016", "role": 0},
+        )
+
+        self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users_old": self.skia.id},
+        )
+        response = self.client.get(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertTrue(response.status_code == 200)
+        content = str(response.content)
+        self.assertTrue(
+            "Richard Batsbak</a></td>\\n                    <td>Responsable info</td>"
+            in content
+        )
+        self.assertFalse(
+            "S&#39; Kia</a></td>\\n                    <td>Curieux</td>" in content
+        )
+
+    def test_mark_old_user_to_club_from_richard_fail(self):
+        self.client.login(username="root", password="plop")
+        self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users": self.skia.id, "start_date": "12/06/2016", "role": 3},
+        )
+
+        # Test with richard outside of the club
+        self.client.login(username="rbatsbak", password="plop")
+        response = self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users_old": self.skia.id},
+        )
+        self.assertTrue(response.status_code == 200)
+
+        response = self.client.get(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertTrue(response.status_code == 200)
+        self.assertTrue(
+            "S&#39; Kia</a></td>\\n                    <td>Responsable info</td>"
+            in str(response.content)
+        )
+
+        # Test with lower rights
+        self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users": self.rbatsbak.id, "start_date": "12/06/2016", "role": 0},
+        )
+
+        self.client.post(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id}),
+            {"users_old": self.skia.id},
+        )
+        response = self.client.get(
+            reverse("club:club_members", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertEqual(response.status_code, 200)
+        content = response.content.decode()
+        self.assertIn(
+            "Richard Batsbak</a></td>\n                    <td>Curieux⸱euse</td>",
+            content,
+        )
+        self.assertIn(
+            "S&#39; Kia</a></td>\n                    <td>Responsable info</td>",
+            content,
+        )
+
+
+class MailingFormTest(TestCase):
+    """Perform validation tests for MailingForm"""
+
+    def setUp(self):
+        call_command("populate")
+        self.skia = User.objects.filter(username="skia").first()
+        self.rbatsbak = User.objects.filter(username="rbatsbak").first()
+        self.krophil = User.objects.filter(username="krophil").first()
+        self.comunity = User.objects.filter(username="comunity").first()
+        self.bdf = Club.objects.filter(unix_name="bdf").first()
+        Membership(
+            user=self.rbatsbak,
+            club=self.bdf,
+            start_date=timezone.now(),
+            role=settings.SITH_CLUB_ROLES_ID["Board member"],
+        ).save()
+
+    def test_mailing_list_add_no_moderation(self):
+        # Test with Communication admin
+        self.client.login(username="comunity", password="plop")
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "foyer"},
+        )
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertContains(response, text="Liste de diffusion foyer@utbm.fr")
+
+        # Test with Root
+        self.client.login(username="root", password="plop")
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
+        )
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertContains(response, text="Liste de diffusion mde@utbm.fr")
+
+    def test_mailing_list_add_moderation(self):
+        self.client.login(username="rbatsbak", password="plop")
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
+        )
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertNotContains(response, text="Liste de diffusion mde@utbm.fr")
+        self.assertContains(
+            response, text="<p>Listes de diffusions en attente de modération</p>"
+        )
+        self.assertContains(response, "<li>mde@utbm.fr")
+
+    def test_mailing_list_forbidden(self):
+        # With anonymous user
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertContains(response, "", status_code=403)
+
+        # With user not in club
+        self.client.login(username="krophil", password="plop")
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertContains(response, "", status_code=403)
+
+    def test_add_new_subscription_fail_not_moderated(self):
+        self.client.login(username="rbatsbak", password="plop")
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
+        )
+
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_users": self.skia.id,
+                "subscription_mailing": Mailing.objects.get(email="mde").id,
+            },
+        )
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertNotContains(response, "skia@git.an")
+
+    def test_add_new_subscription_success(self):
+        # Prepare mailing list
+        self.client.login(username="comunity", password="plop")
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
+        )
+
+        # Add single user
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_users": self.skia.id,
+                "subscription_mailing": Mailing.objects.get(email="mde").id,
+            },
+        )
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertContains(response, "skia@git.an")
+
+        # Add multiple users
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_users": "|%s|%s|" % (self.comunity.id, self.rbatsbak.id),
+                "subscription_mailing": Mailing.objects.get(email="mde").id,
+            },
+        )
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertContains(response, "richard@git.an")
+        self.assertContains(response, "comunity@git.an")
+        self.assertContains(response, "skia@git.an")
+
+        # Add arbitrary email
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_email": "arbitrary@git.an",
+                "subscription_mailing": Mailing.objects.get(email="mde").id,
+            },
+        )
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertContains(response, "richard@git.an")
+        self.assertContains(response, "comunity@git.an")
+        self.assertContains(response, "skia@git.an")
+        self.assertContains(response, "arbitrary@git.an")
+
+        # Add user and arbitrary email
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_email": "more.arbitrary@git.an",
+                "subscription_users": self.krophil.id,
+                "subscription_mailing": Mailing.objects.get(email="mde").id,
+            },
+        )
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+        self.assertContains(response, "richard@git.an")
+        self.assertContains(response, "comunity@git.an")
+        self.assertContains(response, "skia@git.an")
+        self.assertContains(response, "arbitrary@git.an")
+        self.assertContains(response, "more.arbitrary@git.an")
+        self.assertContains(response, "krophil@git.an")
+
+    def test_add_new_subscription_fail_form_errors(self):
+        # Prepare mailing list
+        self.client.login(username="comunity", password="plop")
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
+        )
+
+        # Neither email or email is specified
+        response = self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_mailing": Mailing.objects.get(email="mde").id,
+            },
+        )
+        self.assertContains(
+            response, text=_("You must specify at least an user or an email address")
+        )
+
+        # No mailing specified
+        response = self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_users": self.krophil.id,
+            },
+        )
+        self.assertContains(response, text=_("This field is required"))
+
+        # One of the selected users doesn't exist
+        response = self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_users": "|789|",
+                "subscription_mailing": Mailing.objects.get(email="mde").id,
+            },
+        )
+        self.assertContains(
+            response, text=html.escape(_("One of the selected users doesn't exist"))
+        )
+
+        # An user has no email adress
+        self.krophil.email = ""
+        self.krophil.save()
+
+        response = self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_users": self.krophil.id,
+                "subscription_mailing": Mailing.objects.get(email="mde").id,
+            },
+        )
+        self.assertContains(
+            response,
+            text=html.escape(
+                _("One of the selected users doesn't have an email address")
+            ),
+        )
+
+        self.krophil.email = "krophil@git.an"
+        self.krophil.save()
+
+        # An user is added twice
+
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_users": self.krophil.id,
+                "subscription_mailing": Mailing.objects.get(email="mde").id,
+            },
+        )
+
+        response = self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_users": self.krophil.id,
+                "subscription_mailing": Mailing.objects.get(email="mde").id,
+            },
+        )
+        self.assertContains(
+            response,
+            text=html.escape(_("This email is already suscribed in this mailing")),
+        )
+
+    def test_remove_subscription_success(self):
+        # Prepare mailing list
+        self.client.login(username="comunity", password="plop")
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
+        )
+        mde = Mailing.objects.get(email="mde")
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
+                "subscription_users": "|%s|%s|%s|"
+                % (self.comunity.id, self.rbatsbak.id, self.krophil.id),
+                "subscription_mailing": mde.id,
+            },
+        )
+
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+
+        self.assertContains(response, "comunity@git.an")
+        self.assertContains(response, "richard@git.an")
+        self.assertContains(response, "krophil@git.an")
+
+        # Delete one user
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_REMOVE_SUBSCRIPTION,
+                "removal_%d" % mde.id: mde.subscriptions.get(user=self.krophil).id,
+            },
+        )
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+
+        self.assertContains(response, "comunity@git.an")
+        self.assertContains(response, "richard@git.an")
+        self.assertNotContains(response, "krophil@git.an")
+
+        # Delete multiple users
+        self.client.post(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
+            {
+                "action": MailingForm.ACTION_REMOVE_SUBSCRIPTION,
+                "removal_%d"
+                % mde.id: [
+                    user.id
+                    for user in mde.subscriptions.filter(
+                        user__in=[self.rbatsbak, self.comunity]
+                    ).all()
+                ],
+            },
+        )
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+
+        self.assertNotContains(response, "comunity@git.an")
+        self.assertNotContains(response, "richard@git.an")
+        self.assertNotContains(response, "krophil@git.an")
+
+
+class ClubSellingViewTest(TestCase):
+    """
+    Perform basics tests to ensure that the page is available
+    """
+
+    def setUp(self):
+        call_command("populate")
+        self.ae = Club.objects.filter(unix_name="ae").first()
+
+    def test_page_not_internal_error(self):
+        """
+        Test that the page does not return and internal error
+        """
+        self.client.login(username="skia", password="plop")
+        response = self.client.get(
+            reverse("club:club_sellings", kwargs={"club_id": self.ae.id})
+        )
+        self.assertFalse(response.status_code == 500)

club/urls.py

@@ -23,99 +23,93 @@
 #
 #
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from club.views import *
 
 urlpatterns = [
-    url(r"^$", ClubListView.as_view(), name="club_list"),
-    url(r"^new$", ClubCreateView.as_view(), name="club_new"),
-    url(r"^stats$", ClubStatView.as_view(), name="club_stats"),
-    url(r"^(?P<club_id>[0-9]+)/$", ClubView.as_view(), name="club_view"),
-    url(
+    re_path(r"^$", ClubListView.as_view(), name="club_list"),
+    re_path(r"^new$", ClubCreateView.as_view(), name="club_new"),
+    re_path(r"^stats$", ClubStatView.as_view(), name="club_stats"),
+    re_path(r"^(?P<club_id>[0-9]+)/$", ClubView.as_view(), name="club_view"),
+    re_path(
         r"^(?P<club_id>[0-9]+)/rev/(?P<rev_id>[0-9]+)/$",
         ClubRevView.as_view(),
         name="club_view_rev",
     ),
-    url(r"^(?P<club_id>[0-9]+)/hist$", ClubPageHistView.as_view(), name="club_hist"),
-    url(r"^(?P<club_id>[0-9]+)/edit$", ClubEditView.as_view(), name="club_edit"),
-    url(
+    re_path(
+        r"^(?P<club_id>[0-9]+)/hist$", ClubPageHistView.as_view(), name="club_hist"
+    ),
+    re_path(r"^(?P<club_id>[0-9]+)/edit$", ClubEditView.as_view(), name="club_edit"),
+    re_path(
         r"^(?P<club_id>[0-9]+)/edit/page$",
         ClubPageEditView.as_view(),
         name="club_edit_page",
     ),
-    url(
+    re_path(
         r"^(?P<club_id>[0-9]+)/members$", ClubMembersView.as_view(), name="club_members"
     ),
-    url(
+    re_path(
         r"^(?P<club_id>[0-9]+)/elderlies$",
         ClubOldMembersView.as_view(),
         name="club_old_members",
     ),
-    url(
+    re_path(
         r"^(?P<club_id>[0-9]+)/sellings$",
         ClubSellingView.as_view(),
         name="club_sellings",
     ),
-    url(
+    re_path(
         r"^(?P<club_id>[0-9]+)/sellings/csv$",
         ClubSellingCSVView.as_view(),
         name="sellings_csv",
     ),
-    url(r"^(?P<club_id>[0-9]+)/prop$", ClubEditPropView.as_view(), name="club_prop"),
-    url(r"^(?P<club_id>[0-9]+)/tools$", ClubToolsView.as_view(), name="tools"),
-    url(
-        r"^(?P<club_id>[0-9]+)/mailing$",
-        ClubMailingView.as_view(action="display"),
-        name="mailing",
+    re_path(
+        r"^(?P<club_id>[0-9]+)/prop$", ClubEditPropView.as_view(), name="club_prop"
     ),
-    url(
-        r"^(?P<club_id>[0-9]+)/mailing/new/mailing$",
-        ClubMailingView.as_view(action="add_mailing"),
-        name="mailing_create",
+    re_path(r"^(?P<club_id>[0-9]+)/tools$", ClubToolsView.as_view(), name="tools"),
+    re_path(
+        r"^(?P<club_id>[0-9]+)/mailing$", ClubMailingView.as_view(), name="mailing"
     ),
-    url(
-        r"^(?P<club_id>[0-9]+)/mailing/new/subscription$",
-        ClubMailingView.as_view(action="add_member"),
-        name="mailing_subscription_create",
-    ),
-    url(
+    re_path(
         r"^(?P<mailing_id>[0-9]+)/mailing/generate$",
         MailingAutoGenerationView.as_view(),
         name="mailing_generate",
     ),
-    url(
-        r"^(?P<mailing_id>[0-9]+)/mailing/clean$",
-        MailingAutoCleanView.as_view(),
-        name="mailing_clean",
-    ),
-    url(
+    re_path(
         r"^(?P<mailing_id>[0-9]+)/mailing/delete$",
         MailingDeleteView.as_view(),
         name="mailing_delete",
     ),
-    url(
+    re_path(
         r"^(?P<mailing_subscription_id>[0-9]+)/mailing/delete/subscription$",
         MailingSubscriptionDeleteView.as_view(),
         name="mailing_subscription_delete",
     ),
-    url(
+    re_path(
         r"^membership/(?P<membership_id>[0-9]+)/set_old$",
         MembershipSetOldView.as_view(),
         name="membership_set_old",
     ),
-    url(r"^(?P<club_id>[0-9]+)/poster$", PosterListView.as_view(), name="poster_list"),
-    url(
+    re_path(
+        r"^membership/(?P<membership_id>[0-9]+)/delete$",
+        MembershipDeleteView.as_view(),
+        name="membership_delete",
+    ),
+    re_path(
+        r"^(?P<club_id>[0-9]+)/poster$", PosterListView.as_view(), name="poster_list"
+    ),
+    re_path(
         r"^(?P<club_id>[0-9]+)/poster/create$",
         PosterCreateView.as_view(),
         name="poster_create",
     ),
-    url(
+    re_path(
         r"^(?P<club_id>[0-9]+)/poster/(?P<poster_id>[0-9]+)/edit$",
         PosterEditView.as_view(),
         name="poster_edit",
     ),
-    url(
+    re_path(
         r"^(?P<club_id>[0-9]+)/poster/(?P<poster_id>[0-9]+)/delete$",
         PosterDeleteView.as_view(),
         name="poster_delete",

club/views.py

@@ -23,93 +23,53 @@
 #
 #
 
+import csv
+
+from django.conf import settings
 from django import forms
 from django.views.generic import ListView, DetailView, TemplateView, View
 from django.views.generic.edit import DeleteView
 from django.views.generic.detail import SingleObjectMixin
 from django.views.generic.edit import UpdateView, CreateView
-from django.http import HttpResponseRedirect, HttpResponse, Http404
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.http import (
+    HttpResponseRedirect,
+    HttpResponse,
+    Http404,
+    StreamingHttpResponse,
+)
+from django.urls import reverse, reverse_lazy
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
-from django.utils.translation import ugettext as _t
-from ajax_select.fields import AutoCompleteSelectField
-from django.core.exceptions import PermissionDenied
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _t
+from django.core.exceptions import PermissionDenied, ValidationError, NON_FIELD_ERRORS
+from django.core.paginator import Paginator, InvalidPage
 from django.shortcuts import get_object_or_404, redirect
+from django.db.models import Sum
+
 
 from core.views import (
     CanCreateMixin,
     CanViewMixin,
     CanEditMixin,
     CanEditPropMixin,
+    UserIsRootMixin,
     TabedViewMixin,
     PageEditViewBase,
+    DetailFormView,
 )
-from core.views.forms import SelectDate, SelectDateTime
-from club.models import Club, Membership, Mailing, MailingSubscription
-from sith.settings import SITH_MAXIMUM_FREE_ROLE
-from counter.models import Selling, Counter
-from core.models import User, PageRev
+from core.models import PageRev
+
+from counter.models import Selling
+
 from com.views import (
     PosterListBaseView,
     PosterCreateBaseView,
     PosterEditBaseView,
     PosterDeleteBaseView,
 )
-from com.models import Poster
 
-from django.conf import settings
-
-# Custom forms
-
-
-class ClubEditForm(forms.ModelForm):
-    class Meta:
-        model = Club
-        fields = ["address", "logo", "short_description"]
-
-    def __init__(self, *args, **kwargs):
-        super(ClubEditForm, self).__init__(*args, **kwargs)
-        self.fields["short_description"].widget = forms.Textarea()
-
-
-class MailingForm(forms.ModelForm):
-    class Meta:
-        model = Mailing
-        fields = ("email", "club", "moderator")
-
-    def __init__(self, *args, **kwargs):
-        club_id = kwargs.pop("club_id", None)
-        user_id = kwargs.pop("user_id", -1)  # Remember 0 is treated as None
-        super(MailingForm, self).__init__(*args, **kwargs)
-        if club_id:
-            self.fields["club"].queryset = Club.objects.filter(id=club_id)
-            self.fields["club"].initial = club_id
-            self.fields["club"].widget = forms.HiddenInput()
-        if user_id >= 0:
-            self.fields["moderator"].queryset = User.objects.filter(id=user_id)
-            self.fields["moderator"].initial = user_id
-            self.fields["moderator"].widget = forms.HiddenInput()
-
-
-class MailingSubscriptionForm(forms.ModelForm):
-    class Meta:
-        model = MailingSubscription
-        fields = ("mailing", "user", "email")
-
-    def __init__(self, *args, **kwargs):
-        kwargs.pop("user_id", None)  # For standart interface
-        club_id = kwargs.pop("club_id", None)
-        super(MailingSubscriptionForm, self).__init__(*args, **kwargs)
-        self.fields["email"].required = False
-        if club_id:
-            self.fields["mailing"].queryset = Mailing.objects.filter(
-                club__id=club_id, is_moderated=True
-            )
-
-    user = AutoCompleteSelectField(
-        "users", label=_("User"), help_text=None, required=False
-    )
+from club.models import Club, Membership, Mailing, MailingSubscription
+from club.forms import MailingForm, ClubEditForm, ClubMemberForm, SellingsForm
 
 
 class ClubTabsMixin(TabedViewMixin):
@@ -305,32 +265,7 @@ class ClubToolsView(ClubTabsMixin, CanEditMixin, DetailView):
     current_tab = "tools"
 
 
-class ClubMemberForm(forms.ModelForm):
-    """
-    Form handling the members of a club
-    """
-
-    error_css_class = "error"
-    required_css_class = "required"
-
-    class Meta:
-        model = Membership
-        fields = ["user", "role", "start_date", "description"]
-        widgets = {"start_date": SelectDate}
-
-    user = AutoCompleteSelectField(
-        "users", required=True, label=_("Select user"), help_text=None
-    )
-
-    def save(self, *args, **kwargs):
-        """
-        Overloaded to return the club, and not to a Membership object that has no view
-        """
-        super(ClubMemberForm, self).save(*args, **kwargs)
-        return self.instance.club
-
-
-class ClubMembersView(ClubTabsMixin, CanViewMixin, UpdateView):
+class ClubMembersView(ClubTabsMixin, CanViewMixin, DetailFormView):
     """
     View of a club's members
     """
@@ -341,52 +276,45 @@ class ClubMembersView(ClubTabsMixin, CanViewMixin, UpdateView):
     template_name = "club/club_members.jinja"
     current_tab = "members"
 
-    def get_form(self):
-        """
-        Here we get a Membership object, but the view handles Club object.
-        That's why the save method of ClubMemberForm is overridden.
-        """
-        form = super(ClubMembersView, self).get_form()
-        if (
-            "user" in form.data and form.data.get("user") != ""
-        ):  # Load an existing membership if possible
-            form.instance = (
-                Membership.objects.filter(club=self.object)
-                .filter(user=form.data.get("user"))
-                .filter(end_date=None)
-                .first()
-            )
-        if form.instance is None:  # Instanciate a new membership
-            form.instance = Membership(club=self.object, user=self.request.user)
-        if not self.request.user.is_root:
-            form.fields.pop("start_date", None)
-        return form
+    def get_form_kwargs(self):
+        kwargs = super(ClubMembersView, self).get_form_kwargs()
+        kwargs["request_user"] = self.request.user
+        kwargs["club"] = self.get_object()
+        kwargs["club_members"] = self.members
+        return kwargs
+
+    def get_context_data(self, *args, **kwargs):
+        kwargs = super(ClubMembersView, self).get_context_data(*args, **kwargs)
+        kwargs["members"] = self.members
+        return kwargs
 
     def form_valid(self, form):
         """
-            Check user rights
+        Check user rights
         """
-        user = self.request.user
-        ms = self.object.get_membership_for(user)
-        if (
-            form.cleaned_data["role"] <= SITH_MAXIMUM_FREE_ROLE
-            or (ms is not None and ms.role >= form.cleaned_data["role"])
-            or user.is_board_member
-            or user.is_root
-        ):
-            form.save()
-            form = self.form_class()
-            return super(ModelFormMixin, self).form_valid(form)
-        else:
-            form.add_error(None, _("You do not have the permission to do that"))
-            return self.form_invalid(form)
+        resp = super(ClubMembersView, self).form_valid(form)
+
+        data = form.clean()
+        users = data.pop("users", [])
+        users_old = data.pop("users_old", [])
+        for user in users:
+            Membership(club=self.get_object(), user=user, **data).save()
+        for user in users_old:
+            membership = self.get_object().get_membership_for(user)
+            membership.end_date = timezone.now()
+            membership.save()
+        return resp
 
     def dispatch(self, request, *args, **kwargs):
-        self.request = request
+        self.members = (
+            self.get_object().members.filter(end_date=None).order_by("-role").all()
+        )
         return super(ClubMembersView, self).dispatch(request, *args, **kwargs)
 
     def get_success_url(self, **kwargs):
-        return reverse_lazy("club:club_members", kwargs={"club_id": self.club.id})
+        return reverse_lazy(
+            "club:club_members", kwargs={"club_id": self.get_object().id}
+        )
 
 
 class ClubOldMembersView(ClubTabsMixin, CanViewMixin, DetailView):
@@ -400,25 +328,7 @@ class ClubOldMembersView(ClubTabsMixin, CanViewMixin, DetailView):
     current_tab = "elderlies"
 
 
-class SellingsFormBase(forms.Form):
-    begin_date = forms.DateTimeField(
-        ["%Y-%m-%d %H:%M:%S"],
-        label=_("Begin date"),
-        required=False,
-        widget=SelectDateTime,
-    )
-    end_date = forms.DateTimeField(
-        ["%Y-%m-%d %H:%M:%S"],
-        label=_("End date"),
-        required=False,
-        widget=SelectDateTime,
-    )
-    counter = forms.ModelChoiceField(
-        Counter.objects.order_by("name").all(), label=_("Counter"), required=False
-    )
-
-
-class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailView):
+class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailFormView):
     """
     Sellings of a club
     """
@@ -427,21 +337,35 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailView):
     pk_url_kwarg = "club_id"
     template_name = "club/club_sellings.jinja"
     current_tab = "sellings"
+    form_class = SellingsForm
+    paginate_by = 70
 
-    def get_form_class(self):
-        kwargs = {
-            "product": forms.ModelChoiceField(
-                self.object.products.order_by("name").all(),
-                label=_("Product"),
-                required=False,
-            )
-        }
-        return type("SellingsForm", (SellingsFormBase,), kwargs)
+    def dispatch(self, request, *args, **kwargs):
+        try:
+            self.asked_page = int(request.GET.get("page", 1))
+        except ValueError:
+            raise Http404
+        return super(ClubSellingView, self).dispatch(request, *args, **kwargs)
+
+    def get_form_kwargs(self):
+        kwargs = super(ClubSellingView, self).get_form_kwargs()
+        kwargs["club"] = self.object
+        return kwargs
+
+    def post(self, request, *args, **kwargs):
+        return self.get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
         kwargs = super(ClubSellingView, self).get_context_data(**kwargs)
-        form = self.get_form_class()(self.request.GET)
         qs = Selling.objects.filter(club=self.object)
+
+        kwargs["result"] = qs[:0]
+        kwargs["paginated_result"] = kwargs["result"]
+        kwargs["total"] = 0
+        kwargs["total_quantity"] = 0
+        kwargs["benefit"] = 0
+
+        form = self.get_form()
         if form.is_valid():
             if not len([v for v in form.cleaned_data.values() if v is not None]):
                 qs = Selling.objects.filter(id=-1)
@@ -449,19 +373,36 @@ class ClubSellingView(ClubTabsMixin, CanEditMixin, DetailView):
                 qs = qs.filter(date__gte=form.cleaned_data["begin_date"])
             if form.cleaned_data["end_date"]:
                 qs = qs.filter(date__lte=form.cleaned_data["end_date"])
-            if form.cleaned_data["counter"]:
-                qs = qs.filter(counter=form.cleaned_data["counter"])
-            if form.cleaned_data["product"]:
-                qs = qs.filter(product__id=form.cleaned_data["product"].id)
+
+            if form.cleaned_data["counters"]:
+                qs = qs.filter(counter__in=form.cleaned_data["counters"])
+
+            selected_products = []
+            if form.cleaned_data["products"]:
+                selected_products.extend(form.cleaned_data["products"])
+            if form.cleaned_data["archived_products"]:
+                selected_products.extend(form.cleaned_data["archived_products"])
+
+            if len(selected_products) > 0:
+                qs = qs.filter(product__in=selected_products)
+
             kwargs["result"] = qs.all().order_by("-id")
-            kwargs["total"] = sum([s.quantity * s.unit_price for s in qs.all()])
-            kwargs["total_quantity"] = sum([s.quantity for s in qs.all()])
-            kwargs["benefit"] = kwargs["total"] - sum(
-                [s.product.purchase_price for s in qs.exclude(product=None)]
+            kwargs["total"] = sum([s.quantity * s.unit_price for s in kwargs["result"]])
+            total_quantity = qs.all().aggregate(Sum("quantity"))
+            if total_quantity["quantity__sum"]:
+                kwargs["total_quantity"] = total_quantity["quantity__sum"]
+            benefit = (
+                qs.exclude(product=None).all().aggregate(Sum("product__purchase_price"))
             )
-        else:
-            kwargs["result"] = qs[:0]
-        kwargs["form"] = form
+            if benefit["product__purchase_price__sum"]:
+                kwargs["benefit"] = benefit["product__purchase_price__sum"]
+
+        kwargs["paginator"] = Paginator(kwargs["result"], self.paginate_by)
+        try:
+            kwargs["paginated_result"] = kwargs["paginator"].page(self.asked_page)
+        except InvalidPage:
+            raise Http404
+
         return kwargs
 
 
@@ -470,16 +411,46 @@ class ClubSellingCSVView(ClubSellingView):
     Generate sellings in csv for a given period
     """
 
-    def get(self, request, *args, **kwargs):
-        import csv
+    class StreamWriter:
+        """Implements a file-like interface for streaming the CSV"""
+
+        def write(self, value):
+            """Write the value by returning it, instead of storing in a buffer."""
+            return value
+
+    def write_selling(self, selling):
+        row = [selling.date, selling.counter]
+        if selling.seller:
+            row.append(selling.seller.get_display_name())
+        else:
+            row.append("")
+        if selling.customer:
+            row.append(selling.customer.user.get_display_name())
+        else:
+            row.append("")
+        row = row + [
+            selling.label,
+            selling.quantity,
+            selling.quantity * selling.unit_price,
+            selling.get_payment_method_display(),
+        ]
+        if selling.product:
+            row.append(selling.product.selling_price)
+            row.append(selling.product.purchase_price)
+            row.append(selling.product.selling_price - selling.product.purchase_price)
+        else:
+            row = row + ["", "", ""]
+        return row
+
+    def get(self, request, *args, **kwargs):
 
-        response = HttpResponse(content_type="text/csv")
         self.object = self.get_object()
-        name = _("Sellings") + "_" + self.object.name + ".csv"
-        response["Content-Disposition"] = "filename=" + name
         kwargs = self.get_context_data(**kwargs)
+
+        # Use the StreamWriter class instead of request for streaming
+        pseudo_buffer = self.StreamWriter()
         writer = csv.writer(
-            response, delimiter=";", lineterminator="\n", quoting=csv.QUOTE_ALL
+            pseudo_buffer, delimiter=";", lineterminator="\n", quoting=csv.QUOTE_ALL
         )
 
         writer.writerow([_t("Quantity"), kwargs["total_quantity"]])
@@ -500,29 +471,17 @@ class ClubSellingCSVView(ClubSellingView):
                 _t("Benefit"),
             ]
         )
-        for o in kwargs["result"]:
-            row = [o.date, o.counter]
-            if o.seller:
-                row.append(o.seller.get_display_name())
-            else:
-                row.append("")
-            if o.customer:
-                row.append(o.customer.user.get_display_name())
-            else:
-                row.append("")
-            row = row + [
-                o.label,
-                o.quantity,
-                o.quantity * o.unit_price,
-                o.get_payment_method_display(),
-            ]
-            if o.product:
-                row.append(o.product.selling_price)
-                row.append(o.product.purchase_price)
-                row.append(o.product.selling_price - o.product.purchase_price)
-            else:
-                row = row + ["", "", ""]
-            writer.writerow(row)
+
+        # Stream response
+        response = StreamingHttpResponse(
+            (
+                writer.writerow(self.write_selling(selling))
+                for selling in kwargs["result"]
+            ),
+            content_type="text/csv",
+        )
+        name = _("Sellings") + "_" + self.object.name + ".csv"
+        response["Content-Disposition"] = "filename=" + name
 
         return response
 
@@ -551,7 +510,7 @@ class ClubEditPropView(ClubTabsMixin, CanEditPropMixin, UpdateView):
     current_tab = "props"
 
 
-class ClubCreateView(CanEditPropMixin, CreateView):
+class ClubCreateView(CanCreateMixin, CreateView):
     """
     Create a club (for the Sith admin)
     """
@@ -593,6 +552,19 @@ class MembershipSetOldView(CanEditMixin, DetailView):
         )
 
 
+class MembershipDeleteView(UserIsRootMixin, DeleteView):
+    """
+    Delete a membership (for admins only)
+    """
+
+    model = Membership
+    pk_url_kwarg = "membership_id"
+    template_name = "core/delete_confirm.jinja"
+
+    def get_success_url(self):
+        return reverse_lazy("core:user_clubs", kwargs={"user_id": self.object.user.id})
+
+
 class ClubStatView(TemplateView):
     template_name = "club/stats.jinja"
 
@@ -602,94 +574,135 @@ class ClubStatView(TemplateView):
         return kwargs
 
 
-class ClubMailingView(ClubTabsMixin, ListView):
+class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
     """
     A list of mailing for a given club
     """
 
-    action = None
-    model = Mailing
+    model = Club
+    form_class = MailingForm
+    pk_url_kwarg = "club_id"
     template_name = "club/mailing.jinja"
     current_tab = "mailing"
 
-    def authorized(self):
-        return (
-            self.club.has_rights_in_club(self.user)
-            or self.user.is_root
-            or self.user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
-        )
+    def get_form_kwargs(self):
+        kwargs = super(ClubMailingView, self).get_form_kwargs()
+        kwargs["club_id"] = self.get_object().id
+        kwargs["user_id"] = self.request.user.id
+        kwargs["mailings"] = self.mailings
+        return kwargs
 
     def dispatch(self, request, *args, **kwargs):
-        self.club = get_object_or_404(Club, pk=kwargs["club_id"])
-        self.user = request.user
-        self.object = self.club
-        if not self.authorized():
-            raise PermissionDenied
-        self.member_form = MailingSubscriptionForm(club_id=self.club.id)
-        self.mailing_form = MailingForm(club_id=self.club.id, user_id=self.user.id)
+        self.mailings = Mailing.objects.filter(club_id=self.get_object().id).all()
         return super(ClubMailingView, self).dispatch(request, *args, **kwargs)
 
-    def post(self, request, *args, **kwargs):
-        res = super(ClubMailingView, self).get(request, *args, **kwargs)
-        if self.action != "display":
-            if self.action == "add_mailing":
-                form = MailingForm
-                model = Mailing
-            elif self.action == "add_member":
-                form = MailingSubscriptionForm
-                model = MailingSubscription
-            return MailingGenericCreateView.as_view(
-                model=model, list_view=self, form_class=form
-            )(request, *args, **kwargs)
-        return res
-
-    def get_queryset(self):
-        return Mailing.objects.filter(club_id=self.club.id).all()
-
     def get_context_data(self, **kwargs):
         kwargs = super(ClubMailingView, self).get_context_data(**kwargs)
-        kwargs["add_member"] = self.member_form
-        kwargs["add_mailing"] = self.mailing_form
-        kwargs["club"] = self.club
-        kwargs["user"] = self.user
-        kwargs["has_objects"] = len(kwargs["object_list"]) > 0
+        kwargs["club"] = self.get_object()
+        kwargs["user"] = self.request.user
+        kwargs["mailings"] = self.mailings
+        kwargs["mailings_moderated"] = (
+            kwargs["mailings"].exclude(is_moderated=False).all()
+        )
+        kwargs["mailings_not_moderated"] = (
+            kwargs["mailings"].exclude(is_moderated=True).all()
+        )
+        kwargs["form_actions"] = {
+            "NEW_MALING": self.form_class.ACTION_NEW_MAILING,
+            "NEW_SUBSCRIPTION": self.form_class.ACTION_NEW_SUBSCRIPTION,
+            "REMOVE_SUBSCRIPTION": self.form_class.ACTION_REMOVE_SUBSCRIPTION,
+        }
         return kwargs
 
-    def get_object(self):
-        return self.club
+    def add_new_mailing(self, cleaned_data) -> ValidationError:
+        """
+        Create a new mailing list from the form
+        """
+        mailing = Mailing(
+            club=self.get_object(),
+            email=cleaned_data["mailing_email"],
+            moderator=self.request.user,
+            is_moderated=False,
+        )
+        try:
+            mailing.clean()
+        except ValidationError as validation_error:
+            return validation_error
+        mailing.save()
+        return None
 
+    def add_new_subscription(self, cleaned_data) -> ValidationError:
+        """
+        Add mailing subscriptions for each user given and/or for the specified email in form
+        """
+        users_to_save = []
 
-class MailingGenericCreateView(CreateView, SingleObjectMixin):
-    """
-    Create a new mailing list
-    """
+        for user in cleaned_data["subscription_users"]:
+            sub = MailingSubscription(
+                mailing=cleaned_data["subscription_mailing"], user=user
+            )
+            try:
+                sub.clean()
+            except ValidationError as validation_error:
+                return validation_error
 
-    list_view = None
-    form_class = None
+            sub.save()
+            users_to_save.append(sub)
 
-    def get_context_data(self, **kwargs):
-        view_kwargs = self.list_view.get_context_data(**kwargs)
-        for key, data in (
-            super(MailingGenericCreateView, self).get_context_data(**kwargs).items()
-        ):
-            view_kwargs[key] = data
-        view_kwargs[self.list_view.action] = view_kwargs["form"]
-        return view_kwargs
+        if cleaned_data["subscription_email"]:
+            sub = MailingSubscription(
+                mailing=cleaned_data["subscription_mailing"],
+                email=cleaned_data["subscription_email"],
+            )
 
-    def get_form_kwargs(self):
-        kwargs = super(MailingGenericCreateView, self).get_form_kwargs()
-        kwargs["club_id"] = self.list_view.club.id
-        kwargs["user_id"] = self.list_view.user.id
-        return kwargs
+        try:
+            sub.clean()
+        except ValidationError as validation_error:
+            return validation_error
+        sub.save()
 
-    def dispatch(self, request, *args, **kwargs):
-        if not self.list_view.authorized():
-            raise PermissionDenied
-        self.template_name = self.list_view.template_name
-        return super(MailingGenericCreateView, self).dispatch(request, *args, **kwargs)
+        # Save users after we are sure there is no error
+        for user in users_to_save:
+            user.save()
+
+        return None
+
+    def remove_subscription(self, cleaned_data):
+        """
+        Remove specified users from a mailing list
+        """
+        fields = [
+            cleaned_data[key]
+            for key in cleaned_data.keys()
+            if key.startswith("removal_")
+        ]
+        for field in fields:
+            for sub in field:
+                sub.delete()
+
+    def form_valid(self, form):
+        resp = super(ClubMailingView, self).form_valid(form)
+
+        cleaned_data = form.clean()
+        error = None
+
+        if cleaned_data["action"] == self.form_class.ACTION_NEW_MAILING:
+            error = self.add_new_mailing(cleaned_data)
+
+        if cleaned_data["action"] == self.form_class.ACTION_NEW_SUBSCRIPTION:
+            error = self.add_new_subscription(cleaned_data)
+
+        if cleaned_data["action"] == self.form_class.ACTION_REMOVE_SUBSCRIPTION:
+            self.remove_subscription(cleaned_data)
+
+        if error:
+            form.add_error(NON_FIELD_ERRORS, error)
+            return self.form_invalid(form)
+
+        return resp
 
     def get_success_url(self, **kwargs):
-        return reverse_lazy("club:mailing", kwargs={"club_id": self.list_view.club.id})
+        return reverse_lazy("club:mailing", kwargs={"club_id": self.get_object().id})
 
 
 class MailingDeleteView(CanEditMixin, DeleteView):
@@ -744,18 +757,6 @@ class MailingAutoGenerationView(View):
         return redirect("club:mailing", club_id=club.id)
 
 
-class MailingAutoCleanView(View):
-    def dispatch(self, request, *args, **kwargs):
-        self.mailing = get_object_or_404(Mailing, pk=kwargs["mailing_id"])
-        if not request.user.can_edit(self.mailing):
-            raise PermissionDenied
-        return super(MailingAutoCleanView, self).dispatch(request, *args, **kwargs)
-
-    def get(self, request, *args, **kwargs):
-        self.mailing.subscriptions.all().delete()
-        return redirect("club:mailing", club_id=self.mailing.club.id)
-
-
 class PosterListView(ClubTabsMixin, PosterListBaseView, CanViewMixin):
     """List communication posters"""
 

com/migrations/0002_news_newsdate.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -50,6 +51,7 @@ class Migration(migrations.Migration):
                 (
                     "author",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         related_name="owned_news",
                         to=settings.AUTH_USER_MODEL,
                         verbose_name="author",
@@ -58,12 +60,16 @@ class Migration(migrations.Migration):
                 (
                     "club",
                     models.ForeignKey(
-                        related_name="news", to="club.Club", verbose_name="club"
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="news",
+                        to="club.Club",
+                        verbose_name="club",
                     ),
                 ),
                 (
                     "moderator",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         related_name="moderated_news",
                         null=True,
                         to=settings.AUTH_USER_MODEL,
@@ -99,7 +105,10 @@ class Migration(migrations.Migration):
                 (
                     "news",
                     models.ForeignKey(
-                        related_name="dates", to="com.News", verbose_name="news_date"
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="dates",
+                        to="com.News",
+                        verbose_name="news_date",
                     ),
                 ),
             ],

com/migrations/0003_auto_20170115_2300.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -56,6 +57,7 @@ class Migration(migrations.Migration):
                 (
                     "author",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         to=settings.AUTH_USER_MODEL,
                         verbose_name="author",
                         related_name="owned_weekmail_articles",
@@ -64,6 +66,7 @@ class Migration(migrations.Migration):
                 (
                     "club",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         to="club.Club",
                         verbose_name="club",
                         related_name="weekmail_articles",
@@ -72,6 +75,7 @@ class Migration(migrations.Migration):
                 (
                     "weekmail",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         to="com.Weekmail",
                         verbose_name="weekmail",
                         related_name="articles",

com/migrations/0004_auto_20171221_1614.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 from django.db import migrations, models
 import django.utils.timezone
 from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -48,12 +49,16 @@ class Migration(migrations.Migration):
                 (
                     "club",
                     models.ForeignKey(
-                        verbose_name="club", related_name="posters", to="club.Club"
+                        on_delete=django.db.models.deletion.CASCADE,
+                        verbose_name="club",
+                        related_name="posters",
+                        to="club.Club",
                     ),
                 ),
                 (
                     "moderator",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         verbose_name="moderator",
                         blank=True,
                         null=True,

com/migrations/0006_remove_sith_index_page.py

@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.23 on 2019-08-18 17:00
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("com", "0005_auto_20180318_2227")]
+
+    operations = [migrations.RemoveField(model_name="sith", name="index_page")]

com/models.py

@@ -26,11 +26,11 @@
 from django.shortcuts import render
 from django.db import models, transaction
 from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils import timezone
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.conf import settings
-from django.contrib.staticfiles.templatetags.staticfiles import static
+from django.templatetags.static import static
 from django.core.mail import EmailMultiAlternatives
 from django.core.exceptions import ValidationError
 
@@ -45,7 +45,6 @@ class Sith(models.Model):
 
     alert_msg = models.TextField(_("alert message"), default="", blank=True)
     info_msg = models.TextField(_("info message"), default="", blank=True)
-    index_page = models.TextField(_("index page"), default="", blank=True)
     weekmail_destinations = models.TextField(_("weekmail destinations"), default="")
 
     def is_owned_by(self, user):
@@ -62,6 +61,11 @@ NEWS_TYPES = [
     ("CALL", _("Call")),
 ]
 
+WEEKMAIL_TYPE = [
+    ("WEEKMAIL", _("Weekmail")),
+    ("INVITATION", _("Invitation")),
+]
+
 
 class News(models.Model):
     """The news class"""
@@ -72,13 +76,22 @@ class News(models.Model):
     type = models.CharField(
         _("type"), max_length=16, choices=NEWS_TYPES, default="EVENT"
     )
-    club = models.ForeignKey(Club, related_name="news", verbose_name=_("club"))
+    club = models.ForeignKey(
+        Club, related_name="news", verbose_name=_("club"), on_delete=models.CASCADE
+    )
     author = models.ForeignKey(
-        User, related_name="owned_news", verbose_name=_("author")
+        User,
+        related_name="owned_news",
+        verbose_name=_("author"),
+        on_delete=models.CASCADE,
     )
     is_moderated = models.BooleanField(_("is moderated"), default=False)
     moderator = models.ForeignKey(
-        User, related_name="moderated_news", verbose_name=_("moderator"), null=True
+        User,
+        related_name="moderated_news",
+        verbose_name=_("moderator"),
+        null=True,
+        on_delete=models.CASCADE,
     )
 
     def is_owned_by(self, user):
@@ -139,7 +152,12 @@ class NewsDate(models.Model):
     we don't have to make copies
     """
 
-    news = models.ForeignKey(News, related_name="dates", verbose_name=_("news_date"))
+    news = models.ForeignKey(
+        News,
+        related_name="dates",
+        verbose_name=_("news_date"),
+        on_delete=models.CASCADE,
+    )
     start_date = models.DateTimeField(_("start_date"), null=True, blank=True)
     end_date = models.DateTimeField(_("end_date"), null=True, blank=True)
 
@@ -150,6 +168,13 @@ class NewsDate(models.Model):
 class Weekmail(models.Model):
     """
     The weekmail class
+
+    :ivar title: Title of the weekmail
+    :ivar intro: Introduction of the weekmail
+    :ivar joke: Joke of the week
+    :ivar protip: Tip of the week
+    :ivar conclusion: Conclusion of the weekmail
+    :ivar sent: Track if the weekmail has been sent
     """
 
     title = models.CharField(_("title"), max_length=64, blank=True)
@@ -158,11 +183,18 @@ class Weekmail(models.Model):
     protip = models.TextField(_("protip"), blank=True)
     conclusion = models.TextField(_("conclusion"), blank=True)
     sent = models.BooleanField(_("sent"), default=False)
+    type = models.CharField(
+        _("type"), max_length=16, choices=WEEKMAIL_TYPE, default="WEEKMAIL"
+    )
 
     class Meta:
         ordering = ["-id"]
 
     def send(self):
+        """
+        Send the weekmail to all users with the receive weekmail option opt-in.
+        Also send the weekmail to the mailing list in settings.SITH_COM_EMAIL.
+        """
         dest = [
             i[0]
             for i in Preferences.objects.filter(receive_weekmail=True).values_list(
@@ -184,20 +216,50 @@ class Weekmail(models.Model):
             Weekmail().save()
 
     def render_text(self):
+        """
+        Renders a pure text version of the mail for readers without HTML support.
+        """
         return render(
             None, "com/weekmail_renderer_text.jinja", context={"weekmail": self}
         ).content.decode("utf-8")
 
+    def switch_type(self):
+        """
+        Switch the type of weekmail we are sending :
+            - a simple weekmail
+            - or an invitation
+        """
+        if self.type == "INVITATION":
+            self.type = "WEEKMAIL"
+        else:
+            self.type = "INVITATION"
+
     def render_html(self):
+        """
+        Renders an HTML version of the mail with images and fancy CSS.
+        """
         return render(
             None, "com/weekmail_renderer_html.jinja", context={"weekmail": self}
         ).content.decode("utf-8")
 
     def get_banner(self):
-        return "http://" + settings.SITH_URL + static("com/img/weekmail_bannerA18.jpg")
+        """
+        Return an absolute link to the banner.
+        """
+        if self.type == "INVITATION":
+            return (
+                "http://" + settings.SITH_URL + static("com/img/invitation_bannerP22.png")
+            )
+        return (
+            "http://" + settings.SITH_URL + static("com/img/weekmail_bannerV2P22.png")
+        )
+
 
     def get_footer(self):
-        return "http://" + settings.SITH_URL + static("com/img/weekmail_footerA18.jpg")
+        """
+        Return an absolute link to the footer.
+        """
+        return "http://" + settings.SITH_URL + static("com/img/weekmail_footerP22.png")
 
     def __str__(self):
         return "Weekmail %s (sent: %s) - %s" % (self.id, self.sent, self.title)
@@ -208,15 +270,25 @@ class Weekmail(models.Model):
 
 class WeekmailArticle(models.Model):
     weekmail = models.ForeignKey(
-        Weekmail, related_name="articles", verbose_name=_("weekmail"), null=True
+        Weekmail,
+        related_name="articles",
+        verbose_name=_("weekmail"),
+        null=True,
+        on_delete=models.CASCADE,
     )
     title = models.CharField(_("title"), max_length=64)
     content = models.TextField(_("content"))
     author = models.ForeignKey(
-        User, related_name="owned_weekmail_articles", verbose_name=_("author")
+        User,
+        related_name="owned_weekmail_articles",
+        verbose_name=_("author"),
+        on_delete=models.CASCADE,
     )
     club = models.ForeignKey(
-        Club, related_name="weekmail_articles", verbose_name=_("club")
+        Club,
+        related_name="weekmail_articles",
+        verbose_name=_("club"),
+        on_delete=models.CASCADE,
     )
     rank = models.IntegerField(_("rank"), default=-1)
 
@@ -249,7 +321,11 @@ class Poster(models.Model):
     )
     file = models.ImageField(_("file"), null=False, upload_to="com/posters")
     club = models.ForeignKey(
-        Club, related_name="posters", verbose_name=_("club"), null=False
+        Club,
+        related_name="posters",
+        verbose_name=_("club"),
+        null=False,
+        on_delete=models.CASCADE,
     )
     screens = models.ManyToManyField(Screen, related_name="posters")
     date_begin = models.DateTimeField(blank=False, null=False, default=timezone.now)
@@ -264,6 +340,7 @@ class Poster(models.Model):
         verbose_name=_("moderator"),
         null=True,
         blank=True,
+        on_delete=models.CASCADE,
     )
 
     def save(self, *args, **kwargs):

com/templates/com/news_list.jinja

@@ -6,145 +6,150 @@
 {% endblock %}
 
 {% block content %}
+{% if user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
+<div id="news_admin">
+  <a href="{{ url('com:news_admin_list') }}">{% trans %}Administrate news{% endtrans %}</a>
+</div>
+{% endif  %}
+
 <div id="news">
-    {% if user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID) %}
-    <div id="news_admin">
-      <a href="{{ url('com:news_admin_list') }}">{% trans %}Administrate news{% endtrans %}</a>
-    </div>
-    {% endif  %}
-
-    <div id="right_column" class="news_column">
-      <div id="agenda">
-          <div id="agenda_title">{% trans %}Agenda{% endtrans %}</div>
-          <div id="agenda_content">
-          {% for d in NewsDate.objects.filter(end_date__gte=timezone.now(),
-                  news__is_moderated=True, news__type__in=["WEEKLY",
-                  "EVENT"]).order_by('start_date', 'end_date') %}
-              <div class="agenda_item">
-                  <div class="agenda_date">
-                      <strong>{{ d.start_date|localtime|date('D d M Y') }}</strong>
-                  </div>
-                  <div class="agenda_time">
-                      <span>{{ d.start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-                      <span>{{ d.end_date|localtime|time(DATETIME_FORMAT) }}</span>
-                  </div>
-                  <div>
-                      <strong><a href="{{ url('com:news_detail', news_id=d.news.id) }}">{{ d.news.title }}</a></strong>
-                      <a href="{{ d.news.club.get_absolute_url() }}">{{ d.news.club }}</a>
-                  </div>
-                  <div class="agenda_item_content">{{ d.news.summary|markdown }}</div>
-              </div>
-          {% endfor %}
-          </div>
-      </div>
-
-      <div id="birthdays">
-        <div id="birthdays_title">{% trans %}Birthdays{% endtrans %}</div>
-        <div id="birthdays_content">
-          <ul class="birthdays_year">
-          {% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %}
-          <li>
-              {% trans age=timezone.now().year - d.year %}{{ age }} year old{% endtrans %}
-              <ul>
-              {% for u in birthdays.filter(date_of_birth__year=d.year) %}
-                  <li><a href="{{ u.get_absolute_url() }}">{{ u.get_short_name() }}</a></li>
-              {% endfor %}
-              </ul>
-          </li>
-          {% endfor %}
-          </ul>
-        </div>
-      </div>
-    </div>
-
-
     <div id="left_column" class="news_column">
 
-      {% for news in object_list.filter(type="NOTICE") %}
-      <section class="news_notice">
-          <h4><a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
-          <div class="news_content">{{ news.summary|markdown }}</div>
-      </section>
-      {% endfor %}
+        {% for news in object_list.filter(type="NOTICE") %}
+            <section class="news_notice">
+                <h4><a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+                <div class="news_content">{{ news.summary|markdown }}</div>
+            </section>
+        {% endfor %}
 
-      {% for news in object_list.filter(dates__start_date__lte=timezone.now(),
-          dates__end_date__gte=timezone.now(), type="CALL") %}
-      <section class="news_call">
-          <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
-          <div class="news_date">
-              <span>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-                  {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-              <span>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-                  {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
-          </div>
-          <div class="news_content">{{ news.summary|markdown }}</div>
-      </section>
-      {% endfor %}
+        {% for news in object_list.filter(dates__start_date__lte=timezone.now(), dates__end_date__gte=timezone.now(), type="CALL") %}
+            <section class="news_call">
+                <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+                <div class="news_date">
+                    <span>{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+                        {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+                    <span>{{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+                        {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+                </div>
+                <div class="news_content">{{ news.summary|markdown }}</div>
+            </section>
+        {% endfor %}
 
-      {% set events_dates = NewsDate.objects.filter(end_date__gte=timezone.now(), start_date__lte=timezone.now()+timedelta(days=5),
-                                          news__type="EVENT", news__is_moderated=True).datetimes('start_date', 'day') %}
-      <h3>{% trans %}Events today and the next few days{% endtrans %}</h3>
-      {% if events_dates %}
-      {% for d in events_dates %}
-      <div class="news_events_group">
-          <div class="news_events_group_date">
-              <div>
-                  <div>{{ d|localtime|date('D') }}</div>
-                  <div class="day">{{ d|localtime|date('d') }}</div>
-                  <div>{{ d|localtime|date('b') }}</div>
-              </div>
-          </div>
-          <div class="news_events_group_items">
-              {% for news in object_list.filter(dates__start_date__gte=d,
-                    dates__start_date__lte=d+timedelta(days=1),
-                    type="EVENT").exclude(dates__end_date__lt=timezone.now())
-                    .order_by('dates__start_date') %}
-              <section class="news_event">
-                  <div class="club_logo">
-                    {% if news.club.logo %}
-                    <img src="{{ news.club.logo.url }}" alt="{{ news.club }}" />
-                    {% else %}
-                    <img src="{{ static("com/img/news.png") }}" alt="{{ news.club }}" />
-                    {% endif %}
-                  </div>
-                  <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
-                  <div><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></div>
-                  <div class="news_date">
-                      <span>{{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
-                      <span>{{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
-                  </div>
-                  <div class="news_content">{{ news.summary|markdown }}
-                  <div class="button_bar">
-                    {{ fb_quick(news) }}
-                    {{ tweet_quick(news) }}
-                  </div>
-                  </div>
-              </section>
-              {% endfor %}
-          </div>
-      </div>
-      {% endfor %}
-      {% else %}
-      <div class="news_empty">
-        <em>{% trans %}Nothing to come...{% endtrans %}</em>
-      </div>
-      {% endif %}
+        {% set events_dates = NewsDate.objects.filter(end_date__gte=timezone.now(), start_date__lte=timezone.now()+timedelta(days=5), news__type="EVENT", news__is_moderated=True).datetimes('start_date', 'day') %}
+        <h3>{% trans %}Events today and the next few days{% endtrans %}</h3>
+        {% if events_dates %}
+            {% for d in events_dates %}
+                <div class="news_events_group">
+                    <div class="news_events_group_date">
+                        <div>
+                            <div>{{ d|localtime|date('D') }}</div>
+                            <div class="day">{{ d|localtime|date('d') }}</div>
+                            <div>{{ d|localtime|date('b') }}</div>
+                        </div>
+                    </div>
+                    <div class="news_events_group_items">
+                        {% for news in object_list.filter(dates__start_date__gte=d,
+                        dates__start_date__lte=d+timedelta(days=1),
+                        type="EVENT").exclude(dates__end_date__lt=timezone.now())
+                        .order_by('dates__start_date') %}
+                        <section class="news_event">
+                            <div class="club_logo">
+                                {% if news.club.logo %}
+                                    <img src="{{ news.club.logo.url }}" alt="{{ news.club }}" />
+                                {% else %}
+                                    <img src="{{ static("com/img/news.png") }}" alt="{{ news.club }}" />
+                                {% endif %}
+                            </div>
+                            <h4> <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a></h4>
+                            <div><a href="{{ news.club.get_absolute_url() }}">{{ news.club }}</a></div>
+                            <div class="news_date">
+                                <span>{{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+                                <span>{{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+                            </div>
+                            <div class="news_content">{{ news.summary|markdown }}
+                                <div class="button_bar">
+                                    {{ fb_quick(news) }}
+                                    {{ tweet_quick(news) }}
+                                </div>
+                            </div>
+                        </section>
+                    {% endfor %}
+                    </div>
+                </div>
+            {% endfor %}
+        {% else %}
+            <div class="news_empty">
+                <em>{% trans %}Nothing to come...{% endtrans %}</em>
+            </div>
+        {% endif %}
 
-      {% set coming_soon = object_list.filter(dates__start_date__gte=timezone.now()+timedelta(days=5),
-          type="EVENT").order_by('dates__start_date') %}
-      {% if coming_soon %}
-      <h3>{% trans %}Coming soon... don't miss!{% endtrans %}</h3>
-      {% for news in coming_soon %}
-      <section class="news_coming_soon">
-          <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a>
-          <span class="news_date">{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
-              {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} -
-          {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
-          {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
-      </section>
-      {% endfor %}
-      {% endif %}
+        {% set coming_soon = object_list.filter(dates__start_date__gte=timezone.now()+timedelta(days=5),
+        type="EVENT").order_by('dates__start_date') %}
+        {% if coming_soon %}
+            <h3>{% trans %}Coming soon... don't miss!{% endtrans %}</h3>
+            {% for news in coming_soon %}
+                <section class="news_coming_soon">
+                    <a href="{{ url('com:news_detail', news_id=news.id) }}">{{ news.title }}</a>
+                    <span class="news_date">{{ news.dates.first().start_date|localtime|date(DATETIME_FORMAT) }}
+                        {{ news.dates.first().start_date|localtime|time(DATETIME_FORMAT) }} -
+                        {{ news.dates.first().end_date|localtime|date(DATETIME_FORMAT) }}
+                        {{ news.dates.first().end_date|localtime|time(DATETIME_FORMAT) }}</span>
+                </section>
+            {% endfor %}
+        {% endif %}
     </div>
+
+    <div id="right_column" class="news_column">
+        <div id="agenda">
+            <div id="agenda_title">{% trans %}Agenda{% endtrans %}</div>
+            <div id="agenda_content">
+                {% for d in NewsDate.objects.filter(end_date__gte=timezone.now(),
+                news__is_moderated=True, news__type__in=["WEEKLY",
+                "EVENT"]).order_by('start_date', 'end_date') %}
+                <div class="agenda_item">
+                    <div class="agenda_date">
+                        <strong>{{ d.start_date|localtime|date('D d M Y') }}</strong>
+                    </div>
+                    <div class="agenda_time">
+                        <span>{{ d.start_date|localtime|time(DATETIME_FORMAT) }}</span> -
+                        <span>{{ d.end_date|localtime|time(DATETIME_FORMAT) }}</span>
+                    </div>
+                    <div>
+                        <strong><a href="{{ url('com:news_detail', news_id=d.news.id) }}">{{ d.news.title }}</a></strong>
+                        <a href="{{ d.news.club.get_absolute_url() }}">{{ d.news.club }}</a>
+                    </div>
+                    <div class="agenda_item_content">{{ d.news.summary|markdown }}</div>
+                </div>
+            {% endfor %}
+            </div>
+        </div>
+
+        <div id="birthdays">
+            <div id="birthdays_title">{% trans %}Birthdays{% endtrans %}</div>
+            <div id="birthdays_content">
+                {% if user.is_subscribed %}
+                    {# Cache request for 1 hour #}
+                    {% cache 3600 "birthdays" %}
+                    <ul class="birthdays_year">
+                        {% for d in birthdays.dates('date_of_birth', 'year', 'DESC') %}
+                            <li>
+                                {% trans age=timezone.now().year - d.year %}{{ age }} year old{% endtrans %}
+                                <ul>
+                                    {% for u in birthdays.filter(date_of_birth__year=d.year) %}
+                                        <li><a href="{{ u.get_absolute_url() }}">{{ u.get_short_name() }}</a></li>
+                                    {% endfor %}
+                                </ul>
+                            </li>
+                        {% endfor %}
+                    </ul>
+                    {% endcache %}
+                {% else %}
+                    <p>{% trans %}You need an up to date subscription to access this content{% endtrans %}</p>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
 </div>
 {% endblock %}
 

com/templates/com/poster_list.jinja

@@ -36,8 +36,8 @@
                     <div class="name">{{ poster.name }}</div>
                     <div class="image"><img src="{{ poster.file.url }}"></img></div>
                     <div class="dates">
-                        <div class="begin">{{ poster.date_begin | date("d/M/Y H:m") }}</div>
-                        <div class="end">{{ poster.date_end | date("d/M/Y H:m") }}</div>
+                        <div class="begin">{{ poster.date_begin | localtime | date("d/M/Y H:m") }}</div>
+                        <div class="end">{{ poster.date_end | localtime | date("d/M/Y H:m") }}</div>
                     </div>
                     {% if app == "com" %}
                         <a class="edit" href="{{ url(app + ":poster_edit", poster.id) }}">{% trans %}Edit{% endtrans %}</a>

com/templates/com/weekmail.jinja

@@ -10,6 +10,7 @@
 <p><a href="{{ url('com:weekmail_preview') }}">{% trans %}Preview{% endtrans %}</a></p>
 <p><a href="{{ url('com:weekmail_preview') }}?send=true">{% trans %}Send{% endtrans %}</a></p>
 <p><a href="{{ url('com:weekmail_article') }}">{% trans %}New article{% endtrans %}</a></p>
+<p><a href="{{ url('com:weekmail') }}" onclick="{{weekmail.switch_type()}}">{% trans %}Switch invitation/weekmail{% endtrans %}</a></p>
 <h4>{% trans %}Articles in no weekmail yet{% endtrans %}</h4>
 <table>
     <thead>

com/templates/com/weekmail_preview.jinja

@@ -7,15 +7,33 @@
 
 {% block content %}
 <a href="{{ url('com:weekmail') }}">{% trans %}Back{% endtrans %}</a>
-{% if request.GET['send'] %}
-<p>{% trans %}Are you sure you want to send this weekmail?{% endtrans %}</p>
-{% if request.LANGUAGE_CODE != settings.LANGUAGE_CODE[:2] %}
-<p><strong>{% trans %}Warning: you are sending the weekmail in another language than the default one!{% endtrans %}</strong></p>
-{% endif %}
-<form method="post" action="">
-    {% csrf_token %}
-    <button type="submit" name="send" value="validate">{% trans %}Send{% endtrans %}</button>
-</form>
+{% if bad_recipients %}
+    <p>
+    <span class="important">
+        {% trans %}The following recipients were refused by the SMTP:{% endtrans %}
+    </span>
+    <ul>
+    {% for r in bad_recipients.keys() %}
+        <li>{{ r }}</li>
+    {% endfor %}
+    </ul>
+    </p>
+
+    <form method="post" action="">
+        {% csrf_token %}
+        <button type="submit" name="send" value="clean">{% trans %}Clean subscribers{% endtrans %}</button>
+    </form>
+{% else %}
+    {% if request.GET['send'] %}
+        <p>{% trans %}Are you sure you want to send this weekmail?{% endtrans %}</p>
+        {% if request.LANGUAGE_CODE != settings.LANGUAGE_CODE[:2] %}
+            <p><strong>{% trans %}Warning: you are sending the weekmail in another language than the default one!{% endtrans %}</strong></p>
+        {% endif %}
+        <form method="post" action="">
+            {% csrf_token %}
+            <button type="submit" name="send" value="validate">{% trans %}Send{% endtrans %}</button>
+        </form>
+    {% endif %}
 {% endif %}
 <hr>
 {{ weekmail_rendered|safe }}

com/tests.py

@@ -24,12 +24,37 @@
 
 from django.test import TestCase
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.management import call_command
+from django.utils import html
+from django.utils.translation import gettext as _
+
 
 from core.models import User, RealGroup
 
 
+class ComAlertTest(TestCase):
+    def setUp(self):
+        call_command("populate")
+
+    def test_page_is_working(self):
+        self.client.login(username="comunity", password="plop")
+        response = self.client.get(reverse("com:alert_edit"))
+        self.assertNotEqual(response.status_code, 500)
+        self.assertEqual(response.status_code, 200)
+
+
+class ComInfoTest(TestCase):
+    def setUp(self):
+        call_command("populate")
+
+    def test_page_is_working(self):
+        self.client.login(username="comunity", password="plop")
+        response = self.client.get(reverse("com:info_edit"))
+        self.assertNotEqual(response.status_code, 500)
+        self.assertEqual(response.status_code, 200)
+
+
 class ComTest(TestCase):
     def setUp(self):
         call_command("populate")
@@ -37,7 +62,7 @@ class ComTest(TestCase):
         self.com_group = RealGroup.objects.filter(
             id=settings.SITH_GROUP_COM_ADMIN_ID
         ).first()
-        self.skia.groups = [self.com_group]
+        self.skia.groups.set([self.com_group])
         self.skia.save()
         self.client.login(username=self.skia.username, password="plop")
 
@@ -54,9 +79,11 @@ class ComTest(TestCase):
         )
         r = self.client.get(reverse("core:index"))
         self.assertTrue(r.status_code == 200)
-        self.assertTrue(
-            """<div id="alert_box">\\n                <div class="markdown"><h3>ALERTE!</h3>\\n<p><strong>Caaaataaaapuuuulte!!!!</strong></p>"""
-            in str(r.content)
+        self.assertContains(
+            r,
+            """<div id="alert_box">
+                    <div class="markdown"><h3>ALERTE!</h3>
+<p><strong>Caaaataaaapuuuulte!!!!</strong></p>""",
         )
 
     def test_info_msg(self):
@@ -70,7 +97,28 @@ class ComTest(TestCase):
         )
         r = self.client.get(reverse("core:index"))
         self.assertTrue(r.status_code == 200)
-        self.assertTrue(
-            """<div id="info_box">\\n                <div class="markdown"><h3>INFO: <strong>Caaaataaaapuuuulte!!!!</strong></h3>"""
-            in str(r.content)
+        self.assertContains(
+            r,
+            """<div id="info_box">
+                    <div class="markdown"><h3>INFO: <strong>Caaaataaaapuuuulte!!!!</strong></h3>""",
+        )
+
+    def test_birthday_non_subscribed_user(self):
+        self.client.login(username="guy", password="plop")
+        response = self.client.get(reverse("core:index"))
+        self.assertContains(
+            response,
+            text=html.escape(
+                _("You need an up to date subscription to access this content")
+            ),
+        )
+
+    def test_birthday_subscibed_user(self):
+        response = self.client.get(reverse("core:index"))
+
+        self.assertNotContains(
+            response,
+            text=html.escape(
+                _("You need an up to date subscription to access this content")
+            ),
         )

com/urls.py

@@ -22,98 +22,103 @@
 #
 #
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from com.views import *
 from club.views import MailingDeleteView
 
 urlpatterns = [
-    url(r"^sith/edit/alert$", AlertMsgEditView.as_view(), name="alert_edit"),
-    url(r"^sith/edit/info$", InfoMsgEditView.as_view(), name="info_edit"),
-    url(r"^sith/edit/index$", IndexEditView.as_view(), name="index_edit"),
-    url(
+    re_path(r"^sith/edit/alert$", AlertMsgEditView.as_view(), name="alert_edit"),
+    re_path(r"^sith/edit/info$", InfoMsgEditView.as_view(), name="info_edit"),
+    re_path(
         r"^sith/edit/weekmail_destinations$",
         WeekmailDestinationEditView.as_view(),
         name="weekmail_destinations",
     ),
-    url(r"^weekmail$", WeekmailEditView.as_view(), name="weekmail"),
-    url(r"^weekmail/preview$", WeekmailPreviewView.as_view(), name="weekmail_preview"),
-    url(
+    re_path(r"^weekmail$", WeekmailEditView.as_view(), name="weekmail"),
+    re_path(
+        r"^weekmail/preview$", WeekmailPreviewView.as_view(), name="weekmail_preview"
+    ),
+    re_path(
         r"^weekmail/new_article$",
         WeekmailArticleCreateView.as_view(),
         name="weekmail_article",
     ),
-    url(
+    re_path(
         r"^weekmail/article/(?P<article_id>[0-9]+)/delete$",
         WeekmailArticleDeleteView.as_view(),
         name="weekmail_article_delete",
     ),
-    url(
+    re_path(
         r"^weekmail/article/(?P<article_id>[0-9]+)/edit$",
         WeekmailArticleEditView.as_view(),
         name="weekmail_article_edit",
     ),
-    url(r"^news$", NewsListView.as_view(), name="news_list"),
-    url(r"^news/admin$", NewsAdminListView.as_view(), name="news_admin_list"),
-    url(r"^news/create$", NewsCreateView.as_view(), name="news_new"),
-    url(
+    re_path(r"^news$", NewsListView.as_view(), name="news_list"),
+    re_path(r"^news/admin$", NewsAdminListView.as_view(), name="news_admin_list"),
+    re_path(r"^news/create$", NewsCreateView.as_view(), name="news_new"),
+    re_path(
         r"^news/(?P<news_id>[0-9]+)/delete$",
         NewsDeleteView.as_view(),
         name="news_delete",
     ),
-    url(
+    re_path(
         r"^news/(?P<news_id>[0-9]+)/moderate$",
         NewsModerateView.as_view(),
         name="news_moderate",
     ),
-    url(r"^news/(?P<news_id>[0-9]+)/edit$", NewsEditView.as_view(), name="news_edit"),
-    url(r"^news/(?P<news_id>[0-9]+)$", NewsDetailView.as_view(), name="news_detail"),
-    url(r"^mailings$", MailingListAdminView.as_view(), name="mailing_admin"),
-    url(
+    re_path(
+        r"^news/(?P<news_id>[0-9]+)/edit$", NewsEditView.as_view(), name="news_edit"
+    ),
+    re_path(
+        r"^news/(?P<news_id>[0-9]+)$", NewsDetailView.as_view(), name="news_detail"
+    ),
+    re_path(r"^mailings$", MailingListAdminView.as_view(), name="mailing_admin"),
+    re_path(
         r"^mailings/(?P<mailing_id>[0-9]+)/moderate$",
         MailingModerateView.as_view(),
         name="mailing_moderate",
     ),
-    url(
+    re_path(
         r"^mailings/(?P<mailing_id>[0-9]+)/delete$",
         MailingDeleteView.as_view(redirect_page="com:mailing_admin"),
         name="mailing_delete",
     ),
-    url(r"^poster$", PosterListView.as_view(), name="poster_list"),
-    url(r"^poster/create$", PosterCreateView.as_view(), name="poster_create"),
-    url(
+    re_path(r"^poster$", PosterListView.as_view(), name="poster_list"),
+    re_path(r"^poster/create$", PosterCreateView.as_view(), name="poster_create"),
+    re_path(
         r"^poster/(?P<poster_id>[0-9]+)/edit$",
         PosterEditView.as_view(),
         name="poster_edit",
     ),
-    url(
+    re_path(
         r"^poster/(?P<poster_id>[0-9]+)/delete$",
         PosterDeleteView.as_view(),
         name="poster_delete",
     ),
-    url(
+    re_path(
         r"^poster/moderate$",
         PosterModerateListView.as_view(),
         name="poster_moderate_list",
     ),
-    url(
+    re_path(
         r"^poster/(?P<object_id>[0-9]+)/moderate$",
         PosterModerateView.as_view(),
         name="poster_moderate",
     ),
-    url(r"^screen$", ScreenListView.as_view(), name="screen_list"),
-    url(r"^screen/create$", ScreenCreateView.as_view(), name="screen_create"),
-    url(
+    re_path(r"^screen$", ScreenListView.as_view(), name="screen_list"),
+    re_path(r"^screen/create$", ScreenCreateView.as_view(), name="screen_create"),
+    re_path(
         r"^screen/(?P<screen_id>[0-9]+)/slideshow$",
         ScreenSlideshowView.as_view(),
         name="screen_slideshow",
     ),
-    url(
+    re_path(
         r"^screen/(?P<screen_id>[0-9]+)/edit$",
         ScreenEditView.as_view(),
         name="screen_edit",
     ),
-    url(
+    re_path(
         r"^screen/(?P<screen_id>[0-9]+)/delete$",
         ScreenDeleteView.as_view(),
         name="screen_delete",

com/views.py

@@ -28,8 +28,8 @@ from django.http import HttpResponseRedirect
 from django.views.generic import ListView, DetailView, View
 from django.views.generic.edit import UpdateView, CreateView, DeleteView
 from django.views.generic.detail import SingleObjectMixin
-from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.utils.translation import gettext_lazy as _
+from django.urls import reverse, reverse_lazy
 from django.core.exceptions import ValidationError
 from django.utils import timezone
 from django.conf import settings
@@ -39,6 +39,7 @@ from django.core.exceptions import PermissionDenied
 from django import forms
 
 from datetime import timedelta
+from smtplib import SMTPRecipientsRefused
 
 from com.models import Sith, News, NewsDate, Weekmail, WeekmailArticle, Screen, Poster
 from core.views import (
@@ -52,6 +53,7 @@ from core.views import (
 from core.views.forms import SelectDateTime, MarkdownInput
 from core.models import Notification, RealGroup, User
 from club.models import Club, Mailing
+from core.views.forms import TzAwareDateTimeField
 
 
 # Sith object
@@ -72,20 +74,14 @@ class PosterForm(forms.ModelForm):
             "display_time",
         ]
         widgets = {"screens": forms.CheckboxSelectMultiple}
+        help_texts = {"file": _("Format: 16:9 | Resolution: 1920x1080")}
 
-    date_begin = forms.DateTimeField(
-        ["%Y-%m-%d %H:%M:%S"],
+    date_begin = TzAwareDateTimeField(
         label=_("Start date"),
-        widget=SelectDateTime,
         required=True,
         initial=timezone.now().strftime("%Y-%m-%d %H:%M:%S"),
     )
-    date_end = forms.DateTimeField(
-        ["%Y-%m-%d %H:%M:%S"],
-        label=_("End date"),
-        widget=SelectDateTime,
-        required=False,
-    )
+    date_end = TzAwareDateTimeField(label=_("End date"), required=False)
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop("user", None)
@@ -114,9 +110,6 @@ class ComTabsMixin(TabedViewMixin):
                 "name": _("Weekmail destinations"),
             }
         )
-        tab_list.append(
-            {"url": reverse("com:index_edit"), "slug": "index", "name": _("Index page")}
-        )
         tab_list.append(
             {"url": reverse("com:info_edit"), "slug": "info", "name": _("Info message")}
         )
@@ -182,14 +175,6 @@ class InfoMsgEditView(ComEditView):
     success_url = reverse_lazy("com:info_edit")
 
 
-class IndexEditView(ComEditView):
-    form_class = modelform_factory(
-        Sith, fields=["index_page"], widgets={"index_page": MarkdownInput}
-    )
-    current_tab = "index"
-    success_url = reverse_lazy("com:index_edit")
-
-
 class WeekmailDestinationEditView(ComEditView):
     fields = ["weekmail_destinations"]
     current_tab = "weekmail_destinations"
@@ -210,21 +195,10 @@ class NewsForm(forms.ModelForm):
             "content": MarkdownInput,
         }
 
-    start_date = forms.DateTimeField(
-        ["%Y-%m-%d %H:%M:%S"],
-        label=_("Start date"),
-        widget=SelectDateTime,
-        required=False,
-    )
-    end_date = forms.DateTimeField(
-        ["%Y-%m-%d %H:%M:%S"],
-        label=_("End date"),
-        widget=SelectDateTime,
-        required=False,
-    )
-    until = forms.DateTimeField(
-        ["%Y-%m-%d %H:%M:%S"], label=_("Until"), widget=SelectDateTime, required=False
-    )
+    start_date = TzAwareDateTimeField(label=_("Start date"), required=False)
+    end_date = TzAwareDateTimeField(label=_("End date"), required=False)
+    until = TzAwareDateTimeField(label=_("Until"), required=False)
+
     automoderation = forms.BooleanField(label=_("Automoderation"), required=False)
 
     def clean(self):
@@ -238,7 +212,11 @@ class NewsForm(forms.ModelForm):
                 self.add_error(
                     "end_date", ValidationError(_("This field is required."))
                 )
-            if self.cleaned_data["start_date"] > self.cleaned_data["end_date"]:
+            if (
+                not self.has_error("start_date")
+                and not self.has_error("end_date")
+                and self.cleaned_data["start_date"] > self.cleaned_data["end_date"]
+            ):
                 self.add_error(
                     "end_date",
                     ValidationError(
@@ -437,23 +415,36 @@ class NewsDetailView(CanViewMixin, DetailView):
 # Weekmail
 
 
-class WeekmailPreviewView(ComTabsMixin, CanEditPropMixin, DetailView):
+class WeekmailPreviewView(ComTabsMixin, QuickNotifMixin, CanEditPropMixin, DetailView):
     model = Weekmail
     template_name = "com/weekmail_preview.jinja"
     success_url = reverse_lazy("com:weekmail")
     current_tab = "weekmail"
 
+    def dispatch(self, request, *args, **kwargs):
+        self.bad_recipients = []
+        return super(WeekmailPreviewView, self).dispatch(request, *args, **kwargs)
+
     def post(self, request, *args, **kwargs):
         self.object = self.get_object()
-        try:
-            if request.POST["send"] == "validate":
+        if request.POST["send"] == "validate":
+            try:
                 self.object.send()
                 return HttpResponseRedirect(
                     reverse("com:weekmail") + "?qn_weekmail_send_success"
                 )
-        except:
-            pass
-        return super(WeekmailEditView, self).get(request, *args, **kwargs)
+            except SMTPRecipientsRefused as e:
+                self.bad_recipients = e.recipients
+        elif request.POST["send"] == "clean":
+            try:
+                self.object.send()  # This should fail
+            except SMTPRecipientsRefused as e:
+                users = User.objects.filter(email__in=e.recipients.keys())
+                for u in users:
+                    u.preferences.receive_weekmail = False
+                    u.preferences.save()
+                self.quick_notif_list += ["qn_success"]
+        return super(WeekmailPreviewView, self).get(request, *args, **kwargs)
 
     def get_object(self, queryset=None):
         return self.model.objects.filter(sent=False).order_by("-id").first()
@@ -462,6 +453,7 @@ class WeekmailPreviewView(ComTabsMixin, CanEditPropMixin, DetailView):
         """Add rendered weekmail"""
         kwargs = super(WeekmailPreviewView, self).get_context_data(**kwargs)
         kwargs["weekmail_rendered"] = self.object.render_html()
+        kwargs["bad_recipients"] = self.bad_recipients
         return kwargs
 
 
@@ -538,7 +530,7 @@ class WeekmailEditView(ComTabsMixin, QuickNotifMixin, CanEditPropMixin, UpdateVi
         return super(WeekmailEditView, self).get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
-        """Add orphan articles """
+        """Add orphan articles"""
         kwargs = super(WeekmailEditView, self).get_context_data(**kwargs)
         kwargs["orphans"] = WeekmailArticle.objects.filter(weekmail=None)
         return kwargs
@@ -750,7 +742,7 @@ class PosterEditBaseView(UpdateView):
 
     def get_context_data(self, **kwargs):
         kwargs = super(PosterEditBaseView, self).get_context_data(**kwargs)
-        if not self.request.user.is_com_admin:
+        if hasattr(self, "club"):
             kwargs["club"] = self.club
         return kwargs
 

core/__init__.py

@@ -21,5 +21,3 @@
 # Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 #
-
-default_app_config = "core.apps.SithConfig"

core/management/commands/check_front.py

@@ -0,0 +1,107 @@
+import re
+from subprocess import PIPE, Popen, TimeoutExpired
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+# see https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+# added "v?"
+semver_regex = re.compile(
+    """^v?(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$"""
+)
+
+
+class Command(BaseCommand):
+    help = "Checks the front dependencies are up to date."
+
+    def handle(self, *args, **options):
+        deps = settings.SITH_FRONT_DEP_VERSIONS
+
+        processes = dict(
+            (url, create_process(url))
+            for url in deps.keys()
+            if parse_semver(deps[url]) is not None
+        )
+
+        for url, process in processes.items():
+            try:
+                stdout, stderr = process.communicate(timeout=15)
+            except TimeoutExpired:
+                process.kill()
+                self.stderr.write(self.style.WARNING("{}: timeout".format(url)))
+                continue
+                # error, notice, warning
+
+            stdout = stdout.decode("utf-8")
+            stderr = stderr.decode("utf-8")
+
+            if stderr != "":
+                self.stderr.write(self.style.WARNING(stderr.strip()))
+                continue
+
+            # get all tags, parse them as semvers and find the biggest
+            tags = list_tags(stdout)
+            tags = map(parse_semver, tags)
+            tags = filter(lambda tag: tag is not None, tags)
+            latest_version = max(tags)
+
+            # cannot fail as those which fail are filtered in the processes dict creation
+            current_version = parse_semver(deps[url])
+            assert current_version is not None
+
+            if latest_version == current_version:
+                msg = "{}: {}".format(url, semver_to_s(current_version))
+                self.stdout.write(self.style.SUCCESS(msg))
+            else:
+                msg = "{}: {} < {}".format(
+                    url, semver_to_s(current_version), semver_to_s(latest_version)
+                )
+                self.stdout.write(self.style.ERROR(msg))
+
+
+def create_process(url):
+    """Spawn a "git ls-remote --tags" child process."""
+    return Popen(["git", "ls-remote", "--tags", url], stdout=PIPE, stderr=PIPE)
+
+
+def list_tags(s):
+    """Parses "git ls-remote --tags" output. Takes a string."""
+    tag_prefix = "refs/tags/"
+
+    for line in s.strip().split("\n"):
+        # an example line could be:
+        # "1f41e2293f9c3c1962d2d97afa666207b98a222a\trefs/tags/foo"
+        parts = line.split("\t")
+
+        # check we have a commit ID (SHA-1 hash) and a tag name
+        assert len(parts) == 2
+        assert len(parts[0]) == 40
+        assert parts[1].startswith(tag_prefix)
+
+        # avoid duplicates (a peeled tag will appear twice: as "name" and as "name^{}")
+        if not parts[1].endswith("^{}"):
+            yield parts[1][len(tag_prefix) :]
+
+
+def parse_semver(s):
+    """
+    Turns a semver string into a 3-tuple or None if the parsing failed, it is a
+    prerelease or it has build metadata.
+
+    See https://semver.org
+    """
+    m = semver_regex.match(s)
+
+    if (
+        m is None
+        or m.group("prerelease") is not None
+        or m.group("buildmetadata") is not None
+    ):
+        return None
+
+    return (int(m.group("major")), int(m.group("minor")), int(m.group("patch")))
+
+
+def semver_to_s(t):
+    """Expects a 3-tuple with ints and turns it into a string of type "1.2.3"."""
+    return "{}.{}.{}".format(t[0], t[1], t[2])

core/management/commands/compilemessages.py

@@ -0,0 +1,44 @@
+#!/usr/bin/env python3
+# -*- coding:utf-8 -*
+#
+# Copyright 2019
+# - Sli <antoine@bartuccio.fr>
+#
+# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# http://ae.utbm.fr.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License a published by the Free Software
+# Foundation; either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+
+
+import os
+from django.core.management.commands import compilemessages
+
+
+class Command(compilemessages.Command):
+    """
+    Wrap call to compilemessages to avoid building whole env
+    """
+
+    help = """
+        The usage is the same as the real compilemessages
+         but it goes into the sith dir first
+    """
+
+    def handle(self, *args, **options):
+
+        os.chdir("sith")
+        super(Command, self).handle(*args, **options)

core/management/commands/compilestatic.py

@@ -31,7 +31,7 @@ from django.conf import settings
 
 class Command(BaseCommand):
     """
-        Compiles scss in static folder for production
+    Compiles scss in static folder for production
     """
 
     help = "Compile scss files from static folder"

core/management/commands/documentation.py

@@ -0,0 +1,92 @@
+#!/usr/bin/env python3
+# -*- coding:utf-8 -*
+#
+# Copyright 2019
+# - Sli <antoine@bartuccio.fr>
+#
+# Ce fichier fait partie du site de l'Association des Étudiants de l'UTBM,
+# http://ae.utbm.fr.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License a published by the Free Software
+# Foundation; either version 3 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Sofware Foundation, Inc., 59 Temple
+# Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#
+
+import os
+import sys
+import signal
+
+from http.server import test, CGIHTTPRequestHandler
+
+from django.core.management.base import BaseCommand
+from django.utils import autoreload
+
+
+class Command(BaseCommand):
+    help = "Generate Sphinx documentation and launch basic server"
+
+    default_addr = "127.0.0.1"
+    default_port = "8080"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "addrport", nargs="?", help="Optional port number, or ipaddr:port"
+        )
+
+    def build_documentation(self):
+        os.chdir(os.path.join(self.project_dir, "doc"))
+        err = os.system("make html")
+
+        if err != 0:
+            self.stdout.write("A build error occured")
+
+    def start_server(self, **kwargs):
+        os.chdir(os.path.join(self.project_dir, "doc", "_build/html"))
+        addr = self.default_addr
+        port = self.default_port
+        if kwargs["addrport"]:
+            addrport = kwargs["addrport"].split(":")
+
+            addr = addrport[0]
+
+            if len(addrport) > 1:
+                port = addrport[1]
+
+            if not port.isnumeric():
+                self.stdout.write("%s is not a valid port" % (port,))
+                sys.exit(0)
+
+        test(HandlerClass=CGIHTTPRequestHandler, port=int(port), bind=addr)
+
+    def build_and_start_server(self, **kwargs):
+        self.build_documentation()
+        self.start_server(**kwargs)
+
+    def handle(self, *args, **kwargs):
+        self.project_dir = os.getcwd()
+
+        signal.signal(signal.SIGTERM, lambda *args: sys.exit(0))
+        try:
+            if os.environ.get(autoreload.DJANGO_AUTORELOAD_ENV) == "true":
+                reloader = autoreload.get_reloader()
+                reloader.watch_dir(os.path.join(self.project_dir, "doc"), "**/*.rst")
+                autoreload.logger.info(
+                    "Watching for file changes with %s", reloader.__class__.__name__
+                )
+                autoreload.start_django(reloader, self.build_and_start_server, **kwargs)
+            else:
+                exit_code = autoreload.restart_with_reloader()
+                sys.exit(exit_code)
+        except KeyboardInterrupt:
+            pass

core/management/commands/populate.py

@@ -48,10 +48,11 @@ from accounting.models import (
 from core.utils import resize_image
 from club.models import Club, Membership
 from subscription.models import Subscription
-from counter.models import Customer, ProductType, Product, Counter, Selling
+from counter.models import Customer, ProductType, Product, Counter, Selling, StudentCard
 from com.models import Sith, Weekmail, News, NewsDate
 from election.models import Election, Role, Candidature, ElectionList
 from forum.models import Forum, ForumTopic
+from pedagogy.models import UV
 
 
 class Command(BaseCommand):
@@ -84,6 +85,7 @@ class Command(BaseCommand):
         Group(name="Banned to subscribe").save()
         Group(name="SAS admin").save()
         Group(name="Forum admin").save()
+        Group(name="Pedagogy admin").save()
         self.reset_index("core", "auth")
         root = User(
             id=0,
@@ -140,18 +142,18 @@ class Command(BaseCommand):
             g.save()
             c = Counter(id=b[0], name=b[1], club=bar_club, type="BAR")
             c.save()
-            c.edit_groups = [g]
-            c.save()
+            g.editable_counters.add(c)
+            g.save()
         self.reset_index("counter")
         Counter(name="Eboutic", club=main_club, type="EBOUTIC").save()
         Counter(name="AE", club=main_club, type="OFFICE").save()
 
-        home_root.view_groups = [
-            Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first()
-        ]
-        club_root.view_groups = [
-            Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first()
-        ]
+        home_root.view_groups.set(
+            [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first()]
+        )
+        club_root.view_groups.set(
+            [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first()]
+        )
         home_root.save()
         club_root.save()
 
@@ -161,7 +163,7 @@ class Command(BaseCommand):
         p = Page(name="Index")
         p.set_lock(root)
         p.save()
-        p.view_groups = [settings.SITH_GROUP_PUBLIC_ID]
+        p.view_groups.set([settings.SITH_GROUP_PUBLIC_ID])
         p.set_lock(root)
         p.save()
         PageRev(
@@ -176,7 +178,7 @@ Welcome to the wiki page!
         p = Page(name="services")
         p.set_lock(root)
         p.save()
-        p.view_groups = [settings.SITH_GROUP_PUBLIC_ID]
+        p.view_groups.set([settings.SITH_GROUP_PUBLIC_ID])
         p.set_lock(root)
         PageRev(
             page=p,
@@ -295,9 +297,13 @@ Welcome to the wiki page!
             counter.view_groups = [
                 Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id
             ]
-            counter.groups = [
-                Group.objects.filter(id=settings.SITH_GROUP_COUNTER_ADMIN_ID).first().id
-            ]
+            counter.groups.set(
+                [
+                    Group.objects.filter(id=settings.SITH_GROUP_COUNTER_ADMIN_ID)
+                    .first()
+                    .id
+                ]
+            )
             counter.save()
             # Adding user Comptable
             comptable = User(
@@ -314,11 +320,13 @@ Welcome to the wiki page!
             comptable.view_groups = [
                 Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first().id
             ]
-            comptable.groups = [
-                Group.objects.filter(id=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
-                .first()
-                .id
-            ]
+            comptable.groups.set(
+                [
+                    Group.objects.filter(id=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
+                    .first()
+                    .id
+                ]
+            )
             comptable.save()
             # Adding user Guy
             u = User(
@@ -357,11 +365,11 @@ Welcome to the wiki page!
                 PageRev(
                     page=p, title="Aide sur la syntaxe", author=skia, content=rm.read()
                 ).save()
-            p.view_groups = [settings.SITH_GROUP_PUBLIC_ID]
+            p.view_groups.set([settings.SITH_GROUP_PUBLIC_ID])
             p.save(force_lock=True)
             p = Page(name="Services")
             p.save(force_lock=True)
-            p.view_groups = [settings.SITH_GROUP_PUBLIC_ID]
+            p.view_groups.set([settings.SITH_GROUP_PUBLIC_ID])
             p.save(force_lock=True)
             PageRev(
                 page=p,
@@ -375,13 +383,6 @@ Welcome to the wiki page!
 
 """,
             ).save()
-            # Adding README
-            p = Page(name="README")
-            p.save(force_lock=True)
-            p.view_groups = [settings.SITH_GROUP_PUBLIC_ID]
-            p.save(force_lock=True)
-            with open(os.path.join(root_path) + "/README.md", "r") as rm:
-                PageRev(page=p, title="README", author=skia, content=rm.read()).save()
 
             # Subscription
             default_subscription = "un-semestre"
@@ -610,6 +611,7 @@ Welcome to the wiki page!
             mde.products.add(cons)
             mde.products.add(dcons)
             mde.sellers.add(skia)
+
             mde.save()
 
             eboutic = Counter.objects.filter(name="Eboutic").first()
@@ -837,6 +839,39 @@ Welcome to the wiki page!
                 krophil_profile.save()
                 krophil.profile_pict = krophil_profile
                 krophil.save()
+            # Adding user Com Unity
+            comunity = User(
+                username="comunity",
+                last_name="Unity",
+                first_name="Com",
+                email="comunity@git.an",
+                date_of_birth="1942-06-12",
+            )
+            comunity.set_password("plop")
+            comunity.save()
+            comunity.groups.set(
+                [Group.objects.filter(name="Communication admin").first().id]
+            )
+            comunity.save()
+            Membership(
+                user=comunity,
+                club=bar_club,
+                start_date=timezone.now(),
+                role=settings.SITH_CLUB_ROLES_ID["Board member"],
+            ).save()
+            # Adding user tutu
+            tutu = User(
+                username="tutu",
+                last_name="Tu",
+                first_name="Tu",
+                email="tutu@git.an",
+                date_of_birth="1942-06-12",
+            )
+            tutu.set_password("plop")
+            tutu.save()
+            tutu.groups.set([settings.SITH_GROUP_PEDAGOGY_ADMIN_ID])
+            tutu.save()
+
             # Adding subscription for sli
             s = Subscription(
                 member=User.objects.filter(pk=sli.pk).first(),
@@ -849,6 +884,7 @@ Welcome to the wiki page!
                 start=s.subscription_start,
             )
             s.save()
+            StudentCard(uid="9A89B82018B0A0", customer=sli.customer).save()
             # Adding subscription for Krophil
             s = Subscription(
                 member=User.objects.filter(pk=krophil.pk).first(),
@@ -861,6 +897,30 @@ Welcome to the wiki page!
                 start=s.subscription_start,
             )
             s.save()
+            # Com Unity
+            s = Subscription(
+                member=comunity,
+                subscription_type=default_subscription,
+                payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0],
+            )
+            s.subscription_start = s.compute_start()
+            s.subscription_end = s.compute_end(
+                duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]["duration"],
+                start=s.subscription_start,
+            )
+            s.save()
+            # Tutu
+            s = Subscription(
+                member=tutu,
+                subscription_type=default_subscription,
+                payment_method=settings.SITH_SUBSCRIPTION_PAYMENT_METHOD[0][0],
+            )
+            s.subscription_start = s.compute_start()
+            s.subscription_end = s.compute_end(
+                duration=settings.SITH_SUBSCRIPTIONS[s.subscription_type]["duration"],
+                start=s.subscription_start,
+            )
+            s.save()
 
             Selling(
                 label=dcons.name,
@@ -876,6 +936,7 @@ Welcome to the wiki page!
             # Add barman to counter
             c = Counter.objects.get(id=2)
             c.sellers.add(User.objects.get(pk=krophil.pk))
+            mde.sellers.add(sli)
             c.save()
 
             # Create an election
@@ -1043,3 +1104,35 @@ Welcome to the wiki page!
                     start_date=friday + timedelta(hours=24 * 7 * i),
                     end_date=friday + timedelta(hours=24 * 7 * i + 8),
                 ).save()
+
+            # Create som data for pedagogy
+
+            UV(
+                code="PA00",
+                author=User.objects.get(id=0),
+                credit_type=settings.SITH_PEDAGOGY_UV_TYPE[3][0],
+                manager="Laurent HEYBERGER",
+                semester=settings.SITH_PEDAGOGY_UV_SEMESTER[3][0],
+                language=settings.SITH_PEDAGOGY_UV_LANGUAGE[0][0],
+                department=settings.SITH_PROFILE_DEPARTMENTS[-2][0],
+                credits=5,
+                title="Participation dans une association étudiante",
+                objectives="* Permettre aux étudiants de réaliser, pendant un semestre, un projet culturel ou associatif et de le valoriser.",
+                program="""* Semestre précédent proposition d'un projet et d'un cahier des charges
+* Evaluation par un jury de six membres
+* Si accord réalisation dans le cadre de l'UV
+* Compte-rendu de l'expérience
+* Présentation""",
+                skills="""* Gérer un projet associatif ou une action éducative en autonomie:
+* en produisant un cahier des charges qui -définit clairement le contexte du projet personnel -pose les jalons de ce projet -estime de manière réaliste les moyens et objectifs du projet -définit exactement les livrables attendus
+    * en étant capable de respecter ce cahier des charges ou, le cas échéant, de réviser le cahier des charges de manière argumentée.
+* Relater son expérience dans un rapport:
+* qui permettra à d'autres étudiants de poursuivre les actions engagées
+* qui montre la capacité à s'auto-évaluer et à adopter une distance critique sur son action.""",
+                key_concepts="""* Autonomie
+* Responsabilité
+* Cahier des charges
+* Gestion de projet""",
+                hours_THE=121,
+                hours_TE=4,
+            ).save()

core/markdown.py

@@ -25,7 +25,7 @@
 import os
 import re
 from mistune import Renderer, InlineGrammar, InlineLexer, Markdown, escape, escape_link
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 
 class SithRenderer(Renderer):

core/middleware.py

@@ -23,6 +23,7 @@
 #
 
 import importlib
+import threading
 from django.conf import settings
 from django.utils.functional import SimpleLazyObject
 from django.contrib.auth import get_user
@@ -37,8 +38,8 @@ AnonymousUser = getattr(importlib.import_module(module), klass)
 def get_cached_user(request):
     if not hasattr(request, "_cached_user"):
         user = get_user(request)
-        if user.is_anonymous():
-            user = AnonymousUser(request)
+        if user.is_anonymous:
+            user = AnonymousUser()
 
         request._cached_user = user
 
@@ -49,8 +50,31 @@ class AuthenticationMiddleware(DjangoAuthenticationMiddleware):
     def process_request(self, request):
         assert hasattr(request, "session"), (
             "The Django authentication middleware requires session middleware "
-            "to be installed. Edit your MIDDLEWARE_CLASSES setting to insert "
+            "to be installed. Edit your MIDDLEWARE setting to insert "
             "'django.contrib.sessions.middleware.SessionMiddleware' before "
             "'account.middleware.AuthenticationMiddleware'."
         )
         request.user = SimpleLazyObject(lambda: get_cached_user(request))
+
+
+_threadlocal = threading.local()
+
+
+def get_signal_request():
+    """
+    !!! Do not use if your operation is asynchronus !!!
+    Allow to access current request in signals
+    This is a hack that looks into the thread
+    Mainly used for log purpose
+    """
+
+    return getattr(_threadlocal, "request", None)
+
+
+class SignalRequestMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        setattr(_threadlocal, "request", request)
+        return self.get_response(request)

core/migrations/0001_initial.py

@@ -8,6 +8,7 @@ import django.core.validators
 import core.models
 import phonenumber_field.modelfields
 from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -276,6 +277,7 @@ class Migration(migrations.Migration):
                 (
                     "group_ptr",
                     models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
                         primary_key=True,
                         parent_link=True,
                         serialize=False,
@@ -329,6 +331,7 @@ class Migration(migrations.Migration):
                 (
                     "owner_group",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         default=1,
                         related_name="owned_page",
                         verbose_name="owner group",
@@ -390,10 +393,19 @@ class Migration(migrations.Migration):
                 (
                     "author",
                     models.ForeignKey(
-                        to=settings.AUTH_USER_MODEL, related_name="page_rev"
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                        related_name="page_rev",
+                    ),
+                ),
+                (
+                    "page",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="core.Page",
+                        related_name="revisions",
                     ),
                 ),
-                ("page", models.ForeignKey(to="core.Page", related_name="revisions")),
             ],
             options={"ordering": ["date"]},
         ),
@@ -420,7 +432,9 @@ class Migration(migrations.Migration):
                 (
                     "user",
                     models.OneToOneField(
-                        to=settings.AUTH_USER_MODEL, related_name="preferences"
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                        related_name="preferences",
                     ),
                 ),
             ],
@@ -469,6 +483,7 @@ class Migration(migrations.Migration):
                 (
                     "owner",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         verbose_name="owner",
                         to=settings.AUTH_USER_MODEL,
                         related_name="owned_files",
@@ -477,6 +492,7 @@ class Migration(migrations.Migration):
                 (
                     "parent",
                     models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
                         null=True,
                         related_name="children",
                         verbose_name="parent",
@@ -512,6 +528,7 @@ class Migration(migrations.Migration):
             model_name="user",
             name="home",
             field=models.OneToOneField(
+                on_delete=django.db.models.deletion.CASCADE,
                 blank=True,
                 null=True,
                 related_name="home_of",

core/migrations/0005_auto_20161105_1035.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -21,6 +22,7 @@ class Migration(migrations.Migration):
             model_name="page",
             name="lock_user",
             field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
                 verbose_name="lock user",
                 default=None,
                 blank=True,

core/migrations/0012_notification.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 from django.db import migrations, models
 from django.conf import settings
 import django.utils.timezone
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -48,7 +49,9 @@ class Migration(migrations.Migration):
                 (
                     "user",
                     models.ForeignKey(
-                        related_name="notifications", to=settings.AUTH_USER_MODEL
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="notifications",
+                        to=settings.AUTH_USER_MODEL,
                     ),
                 ),
             ],

core/migrations/0015_sithfile_moderator.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,6 +15,7 @@ class Migration(migrations.Migration):
             model_name="sithfile",
             name="moderator",
             field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
                 related_name="moderated_files",
                 verbose_name="owner",
                 default=0,

core/migrations/0016_auto_20161212_1922.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,6 +15,7 @@ class Migration(migrations.Migration):
             model_name="sithfile",
             name="moderator",
             field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
                 related_name="moderated_files",
                 blank=True,
                 null=True,

core/migrations/0023_auto_20170902_1226.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 from django.conf import settings
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -35,7 +36,9 @@ class Migration(migrations.Migration):
             model_name="preferences",
             name="user",
             field=models.OneToOneField(
-                related_name="_preferences", to=settings.AUTH_USER_MODEL
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="_preferences",
+                to=settings.AUTH_USER_MODEL,
             ),
         ),
     ]

core/migrations/0027_gift.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 from django.db import migrations, models
 from django.conf import settings
 import django.utils.timezone
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -33,7 +34,9 @@ class Migration(migrations.Migration):
                 (
                     "user",
                     models.ForeignKey(
-                        related_name="gifts", to=settings.AUTH_USER_MODEL
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="gifts",
+                        to=settings.AUTH_USER_MODEL,
                     ),
                 ),
             ],

core/migrations/0029_auto_20180426_2013.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 import core.models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
@@ -14,6 +15,7 @@ class Migration(migrations.Migration):
             model_name="page",
             name="owner_group",
             field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
                 verbose_name="owner group",
                 default=core.models.Page.get_default_owner_group,
                 related_name="owned_page",

core/migrations/0030_auto_20190704_1500.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-07-04 13:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("core", "0029_auto_20180426_2013")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="notification",
+            name="type",
+            field=models.CharField(
+                choices=[
+                    ("POSTER_MODERATION", "A new poster needs to be moderated"),
+                    ("MAILING_MODERATION", "A new mailing list needs to be moderated"),
+                    (
+                        "PEDAGOGY_MODERATION",
+                        "A new pedagogy comment has been signaled for moderation",
+                    ),
+                    ("NEWS_MODERATION", "There are %s fresh news to be moderated"),
+                    ("FILE_MODERATION", "New files to be moderated"),
+                    (
+                        "SAS_MODERATION",
+                        "There are %s pictures to be moderated in the SAS",
+                    ),
+                    ("NEW_PICTURES", "You've been identified on some pictures"),
+                    ("REFILLING", "You just refilled of %s €"),
+                    ("SELLING", "You just bought %s"),
+                    ("GENERIC", "You have a notification"),
+                ],
+                default="GENERIC",
+                max_length=32,
+                verbose_name="type",
+            ),
+        )
+    ]

core/migrations/0031_auto_20190906_1615.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.24 on 2019-09-06 14:15
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("core", "0030_auto_20190704_1500")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="sithfile",
+            name="is_folder",
+            field=models.BooleanField(
+                db_index=True, default=True, verbose_name="is folder"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="sithfile",
+            name="is_in_sas",
+            field=models.BooleanField(
+                db_index=True, default=False, verbose_name="is in the SAS"
+            ),
+        ),
+    ]

core/migrations/0032_auto_20190909_0043.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.24 on 2019-09-08 22:43
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("core", "0031_auto_20190906_1615")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="notification",
+            name="viewed",
+            field=models.BooleanField(
+                db_index=True, default=False, verbose_name="viewed"
+            ),
+        )
+    ]

core/migrations/0033_auto_20191006_0049.py

@@ -0,0 +1,27 @@
+# Generated by Django 2.2.6 on 2019-10-05 22:49
+
+import django.contrib.auth.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("core", "0032_auto_20190909_0043")]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="page",
+            options={
+                "permissions": (
+                    (
+                        "change_prop_page",
+                        "Can change the page's properties (groups, ...)",
+                    ),
+                )
+            },
+        ),
+        migrations.AlterModelManagers(
+            name="group",
+            managers=[("objects", django.contrib.auth.models.GroupManager())],
+        ),
+    ]

core/migrations/0034_operationlog.py

@@ -0,0 +1,51 @@
+# Generated by Django 2.2.6 on 2019-11-14 15:10
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0033_auto_20191006_0049"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="OperationLog",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("date", models.DateTimeField(auto_now_add=True, verbose_name="date")),
+                ("label", models.CharField(max_length=255, verbose_name="label")),
+                (
+                    "operation_type",
+                    models.CharField(
+                        choices=[
+                            ("SELLING_DELETION", "Selling deletion"),
+                            ("REFILLING_DELETION", "Refilling deletion"),
+                        ],
+                        max_length=40,
+                        verbose_name="operation type",
+                    ),
+                ),
+                (
+                    "operator",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="logs",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+    ]

core/migrations/0035_auto_20200216_1743.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.2.10 on 2020-02-16 16:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0034_operationlog"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="sex",
+            field=models.CharField(
+                blank=True,
+                choices=[("MAN", "Man"), ("WOMAN", "Woman")],
+                max_length=10,
+                null=True,
+                verbose_name="sex",
+            ),
+        ),
+    ]

core/migrations/0036_auto_20211001_0248.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.2.24 on 2021-10-01 00:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("core", "0035_auto_20200216_1743")]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="pronouns",
+            field=models.CharField(default="", max_length=64, verbose_name="pronouns"),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="sex",
+            field=models.CharField(
+                blank=True,
+                choices=[("MAN", "Man"), ("WOMAN", "Woman"), ("OTHER", "Other")],
+                max_length=10,
+                null=True,
+                verbose_name="sex",
+            ),
+        ),
+    ]

core/migrations/0037_auto_20211105_1708.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.24 on 2021-11-05 16:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("core", "0036_auto_20211001_0248")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="pronouns",
+            field=models.CharField(
+                blank=True, default="", max_length=64, verbose_name="pronouns"
+            ),
+        )
+    ]

core/models.py

@@ -34,11 +34,11 @@ from django.contrib.auth.models import (
     GroupManager as AuthGroupManager,
     AnonymousUser as AuthAnonymousUser,
 )
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.utils import timezone
 from django.core import validators
 from django.core.exceptions import ValidationError, PermissionDenied
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.conf import settings
 from django.db import transaction
 from django.contrib.staticfiles.storage import staticfiles_storage
@@ -65,11 +65,19 @@ class MetaGroupManager(AuthGroupManager):
 
 
 class Group(AuthGroup):
+    """
+    Implement both RealGroups and Meta groups
+
+    Groups are sorted by their is_meta property
+    """
+
+    #: If False, this is a RealGroup
     is_meta = models.BooleanField(
         _("meta group status"),
         default=False,
         help_text=_("Whether a group is a meta group or not"),
     )
+    #: Description of the group
     description = models.CharField(_("description"), max_length=60)
 
     class Meta:
@@ -83,6 +91,15 @@ class Group(AuthGroup):
 
 
 class MetaGroup(Group):
+    """
+    MetaGroups are dynamically created groups.
+    Generaly used with clubs where creating a club creates two groups:
+
+        * club-SITH_BOARD_SUFFIX
+        * club-SITH_MEMBER_SUFFIX
+    """
+
+    #: Assign a manager in a way that MetaGroup.objects only return groups with is_meta=False
     objects = MetaGroupManager()
 
     class Meta:
@@ -94,6 +111,12 @@ class MetaGroup(Group):
 
 
 class RealGroup(Group):
+    """
+    RealGroups are created by the developer.
+    Most of the time they match a number in settings to be easily used for permissions.
+    """
+
+    #: Assign a manager in a way that MetaGroup.objects only return groups with is_meta=True
     objects = RealGroupManager()
 
     class Meta:
@@ -202,9 +225,11 @@ class User(AbstractBaseUser):
     sex = models.CharField(
         _("sex"),
         max_length=10,
-        choices=[("MAN", _("Man")), ("WOMAN", _("Woman"))],
-        default="MAN",
+        null=True,
+        blank=True,
+        choices=[("MAN", _("Man")), ("WOMAN", _("Woman")), ("OTHER", _("Other"))],
     )
+    pronouns = models.CharField(_("pronouns"), max_length=64, blank=True, default="")
     tshirt_size = models.CharField(
         _("tshirt size"),
         max_length=5,
@@ -389,6 +414,20 @@ class User(AbstractBaseUser):
             .has_rights_in_club(self)
         )
 
+    @cached_property
+    def can_read_subscription_history(self):
+        if self.is_root or self.is_board_member:
+            return True
+
+        from club.models import Club
+
+        for club in Club.objects.filter(
+            id__in=settings.SITH_CAN_READ_SUBSCRIPTION_HISTORY
+        ).all():
+            if club.has_rights_in_club(self):
+                return True
+        return False
+
     @cached_property
     def can_create_subscription(self):
         from club.models import Club
@@ -659,17 +698,25 @@ class User(AbstractBaseUser):
 
 
 class AnonymousUser(AuthAnonymousUser):
-    def __init__(self, request):
+    def __init__(self):
         super(AnonymousUser, self).__init__()
 
     @property
     def can_create_subscription(self):
         return False
 
+    @property
+    def can_read_subscription_history(self):
+        return False
+
     @property
     def was_subscribed(self):
         return False
 
+    @property
+    def is_subscribed(self):
+        return False
+
     @property
     def subscribed(self):
         return False
@@ -739,7 +786,9 @@ class AnonymousUser(AuthAnonymousUser):
 
 
 class Preferences(models.Model):
-    user = models.OneToOneField(User, related_name="_preferences")
+    user = models.OneToOneField(
+        User, related_name="_preferences", on_delete=models.CASCADE
+    )
     receive_weekmail = models.BooleanField(
         _("do you want to receive the weekmail"), default=False
     )
@@ -773,7 +822,12 @@ def get_thumbnail_directory(instance, filename):
 class SithFile(models.Model):
     name = models.CharField(_("file name"), max_length=256, blank=False)
     parent = models.ForeignKey(
-        "self", related_name="children", verbose_name=_("parent"), null=True, blank=True
+        "self",
+        related_name="children",
+        verbose_name=_("parent"),
+        null=True,
+        blank=True,
+        on_delete=models.CASCADE,
     )
     file = models.FileField(
         upload_to=get_directory,
@@ -796,14 +850,19 @@ class SithFile(models.Model):
         null=True,
         blank=True,
     )
-    owner = models.ForeignKey(User, related_name="owned_files", verbose_name=_("owner"))
+    owner = models.ForeignKey(
+        User,
+        related_name="owned_files",
+        verbose_name=_("owner"),
+        on_delete=models.CASCADE,
+    )
     edit_groups = models.ManyToManyField(
         Group, related_name="editable_files", verbose_name=_("edit group"), blank=True
     )
     view_groups = models.ManyToManyField(
         Group, related_name="viewable_files", verbose_name=_("view group"), blank=True
     )
-    is_folder = models.BooleanField(_("is folder"), default=True)
+    is_folder = models.BooleanField(_("is folder"), default=True, db_index=True)
     mime_type = models.CharField(_("mime type"), max_length=30)
     size = models.IntegerField(_("size"), default=0)
     date = models.DateTimeField(_("date"), default=timezone.now)
@@ -814,10 +873,11 @@ class SithFile(models.Model):
         verbose_name=_("owner"),
         null=True,
         blank=True,
+        on_delete=models.CASCADE,
     )
     asked_for_removal = models.BooleanField(_("asked for removal"), default=False)
     is_in_sas = models.BooleanField(
-        _("is in the SAS"), default=False
+        _("is in the SAS"), default=False, db_index=True
     )  # Allows to query this flag, updated at each call to save()
 
     class Meta:
@@ -931,8 +991,8 @@ class SithFile(models.Model):
     def copy_rights(self):
         """Copy, if possible, the rights of the parent folder"""
         if self.parent is not None:
-            self.edit_groups = self.parent.edit_groups.all()
-            self.view_groups = self.parent.view_groups.all()
+            self.edit_groups.set(self.parent.edit_groups.all())
+            self.view_groups.set(self.parent.view_groups.all())
             self.save()
 
     def move_to(self, parent):
@@ -1129,6 +1189,7 @@ class Page(models.Model):
         related_name="owned_page",
         verbose_name=_("owner group"),
         default=get_default_owner_group,
+        on_delete=models.CASCADE,
     )
     edit_groups = models.ManyToManyField(
         Group, related_name="editable_page", verbose_name=_("edit group"), blank=True
@@ -1143,6 +1204,7 @@ class Page(models.Model):
         blank=True,
         null=True,
         default=None,
+        on_delete=models.CASCADE,
     )
     lock_timeout = models.DateTimeField(
         _("lock_timeout"), null=True, blank=True, default=None
@@ -1152,7 +1214,6 @@ class Page(models.Model):
         unique_together = ("name", "parent")
         permissions = (
             ("change_prop_page", "Can change the page's properties (groups, ...)"),
-            ("view_page", "Can view the page"),
         )
 
     @staticmethod
@@ -1343,8 +1404,8 @@ class PageRev(models.Model):
     title = models.CharField(_("page title"), max_length=255, blank=True)
     content = models.TextField(_("page content"), blank=True)
     date = models.DateTimeField(_("date"), auto_now=True)
-    author = models.ForeignKey(User, related_name="page_rev")
-    page = models.ForeignKey(Page, related_name="revisions")
+    author = models.ForeignKey(User, related_name="page_rev", on_delete=models.CASCADE)
+    page = models.ForeignKey(Page, related_name="revisions", on_delete=models.CASCADE)
 
     class Meta:
         ordering = ["date"]
@@ -1382,14 +1443,16 @@ class PageRev(models.Model):
 
 
 class Notification(models.Model):
-    user = models.ForeignKey(User, related_name="notifications")
+    user = models.ForeignKey(
+        User, related_name="notifications", on_delete=models.CASCADE
+    )
     url = models.CharField(_("url"), max_length=255)
     param = models.CharField(_("param"), max_length=128, default="")
     type = models.CharField(
         _("type"), max_length=32, choices=settings.SITH_NOTIFICATIONS, default="GENERIC"
     )
     date = models.DateTimeField(_("date"), default=timezone.now)
-    viewed = models.BooleanField(_("viewed"), default=False)
+    viewed = models.BooleanField(_("viewed"), default=False, db_index=True)
 
     def __str__(self):
         if self.param:
@@ -1418,7 +1481,7 @@ class Notification(models.Model):
 class Gift(models.Model):
     label = models.CharField(_("label"), max_length=255)
     date = models.DateTimeField(_("date"), default=timezone.now)
-    user = models.ForeignKey(User, related_name="gifts")
+    user = models.ForeignKey(User, related_name="gifts", on_delete=models.CASCADE)
 
     def __str__(self):
         return "%s - %s" % (self.translated_label, self.date.strftime("%d %b %Y"))
@@ -1434,3 +1497,24 @@ class Gift(models.Model):
 
     def is_owned_by(self, user):
         return user.is_board_member or user.is_root
+
+
+class OperationLog(models.Model):
+    """
+    General purpose log object to register operations
+    """
+
+    date = models.DateTimeField(_("date"), auto_now_add=True)
+    label = models.CharField(_("label"), max_length=255)
+    operator = models.ForeignKey(
+        User, related_name="logs", on_delete=models.SET_NULL, null=True
+    )
+    operation_type = models.CharField(
+        _("operation type"), max_length=40, choices=settings.SITH_LOG_OPERATION_TYPE
+    )
+
+    def is_owned_by(self, user):
+        return user.is_root
+
+    def __str__(self):
+        return "%s - %s - %s" % (self.operation_type, self.label, self.operator)

core/operations.py

@@ -33,16 +33,16 @@ from django.db import connection, migrations
 
 class PsqlRunOnly(migrations.RunSQL):
     """
-        This is an SQL runner that will launch the given command only if
-        the used DBMS is PostgreSQL.
-        It may be useful to run Postgres' specific SQL, or to take actions
-        that would be non-senses with backends other than Postgre, such 
-        as disabling particular constraints that would prevent the migration
-        to run successfully.
+    This is an SQL runner that will launch the given command only if
+    the used DBMS is PostgreSQL.
+    It may be useful to run Postgres' specific SQL, or to take actions
+    that would be non-senses with backends other than Postgre, such
+    as disabling particular constraints that would prevent the migration
+    to run successfully.
 
-        See `club/migrations/0010_auto_20170912_2028.py` as an example.
-        Some explanations can be found here too: 
-        https://stackoverflow.com/questions/28429933/django-migrations-using-runpython-to-commit-changes
+    See `club/migrations/0010_auto_20170912_2028.py` as an example.
+    Some explanations can be found here too:
+    https://stackoverflow.com/questions/28429933/django-migrations-using-runpython-to-commit-changes
     """
 
     def _run_sql(self, schema_editor, sqls):

core/scss/processor.py

@@ -25,9 +25,9 @@
 
 import os
 import sass
+from urllib.parse import urljoin
 from django.utils.encoding import force_bytes, iri_to_uri
 from django.core.files.base import ContentFile
-from django.utils.six.moves.urllib.parse import urljoin
 from django.templatetags.static import static
 from django.conf import settings
 from core.scss.storage import ScssFileStorage, find_file
@@ -35,9 +35,9 @@ from core.scss.storage import ScssFileStorage, find_file
 
 class ScssProcessor(object):
     """
-        If DEBUG mode enabled : compile the scss file
-        Else : give the path of the corresponding css supposed to already be compiled
-        Don't forget to use compilestatics to compile scss for production
+    If DEBUG mode enabled : compile the scss file
+    Else : give the path of the corresponding css supposed to already be compiled
+    Don't forget to use compilestatics to compile scss for production
     """
 
     prefix = iri_to_uri(getattr(settings, "STATIC_URL", "/static/"))

core/search_indexes.py

@@ -34,6 +34,7 @@ from forum.models import ForumMessage, ForumMessageMeta
 class UserIndex(indexes.SearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, use_template=True)
     auto = indexes.EdgeNgramField(use_template=True)
+    last_update = indexes.DateTimeField(model_attr="last_update")
 
     def get_model(self):
         return User
@@ -45,6 +46,9 @@ class UserIndex(indexes.SearchIndex, indexes.Indexable):
     def get_updated_field(self):
         return "last_update"
 
+    def prepare_auto(self, obj):
+        return self.prepared_data["auto"].strip()[:245]
+
 
 class IndexSignalProcessor(signals.BaseSignalProcessor):
     def setup(self):