Merge branch 'wei' into 'main'

Signals used to ignore _no_signal

See merge request bde/nk20!340

.gitignore

@@ -48,6 +48,7 @@ backups/
 env/
 venv/
 db.sqlite3
+shell.nix
 
 # ansibles customs host
 ansible/host_vars/*.yaml

apps/member/signals.py

@@ -16,7 +16,8 @@ def save_user_profile(instance, created, raw, **_kwargs):
 
 
 def update_wei_registration_fee_on_membership_creation(sender, instance, created, **kwargs):
-    if created:
+    if not hasattr(instance, "_no_signal") and created:
+        print('update_wei_registration_fee_on_membership_creation')
         from wei.models import WEIRegistration
         if instance.club.id == 1 or instance.club.id == 2:
             registrations = WEIRegistration.objects.filter(
@@ -24,14 +25,16 @@ def update_wei_registration_fee_on_membership_creation(sender, instance, created
                 wei__year=instance.date_start.year,
             )
             for r in registrations:
+                r._force_save = True
                 r.save()
 
 
 def update_wei_registration_fee_on_club_change(sender, instance, **kwargs):
     from wei.models import WEIRegistration
-    if instance.id == 1 or instance.id == 2:
+    if not hasattr(instance, "_no_signal") and (instance.id == 1 or instance.id == 2):
         registrations = WEIRegistration.objects.filter(
             wei__year=instance.membership_start.year,
         )
         for r in registrations:
+            r._force_save = True
             r.save()

shell-static.nix

@@ -1,34 +0,0 @@
-# This is a workaround meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
-# 
-# The nk20 javascript static location are hardcoded for imperative system.
-# This make ./manage.py collectstatic hard to use with nixos.
-# 
-# A workaround is to enter a FHSUserEnv with the static placed under /share/javascript/<static>.
-# This emulate a debian like system and enable collecting static normally with ./manage.py collectstatics.
-# The regular shell.nix should be enough for other configurations.
-#
-# Warning, you are still supposed to use pip package with a venv !
-{ pkgs ? import <nixpkgs> {} }:
-(pkgs.buildFHSUserEnv {
-  name = "pipzone";
-  targetPkgs = pkgs: (with pkgs;
-  let
-    fhs-static = stdenv.mkDerivation {
-      name = "fhs-static";
-      buildCommand = ''
-      mkdir -p $out/share/javascript/bootstrap4
-      mkdir -p $out/share/javascript/jquery
-      ln -s ${python39Packages.xstatic-bootstrap}/lib/python3.9/site-packages/xstatic/pkg/bootstrap/data/* $out/share/javascript/bootstrap4
-      ln -s ${python39Packages.xstatic-jquery}/lib/python3.9/site-packages/xstatic/pkg/jquery/data/* $out/share/javascript/jquery
-    '';
-    };
-  in [
-    fhs-static
-    python39
-    gettext
-    python39Packages.pip
-    python39Packages.virtualenv
-    python39Packages.setuptools
-  ]);
-  runScript = "bash";
-}).env

shell.nix

@@ -1,23 +0,0 @@
-# This is meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
-#
-# This shell.nix contains all dependencies require to create a venv and pip install -r requirements.txt.
-#
-# Please check shell-static.nix for running ./manage.py collectstatics.
-{ pkgs ? import <nixpkgs> {} }:
-pkgs.mkShell {
-  buildInputs = with pkgs; [
-    python39
-    python39Packages.pip
-    python39Packages.setuptools
-    gettext
-
-  ];
-  shellHook = ''
-    # Tells pip to put packages into $PIP_PREFIX instead of the usual locations.
-    # See https://pip.pypa.io/en/stable/user_guide/#environment-variables.
-    export PIP_PREFIX=$(pwd)/_build/pip_packages
-    export PYTHONPATH="$PIP_PREFIX/${pkgs.python39.sitePackages}:$PYTHONPATH"
-    export PATH="$PIP_PREFIX/bin:$PATH"
-    unset SOURCE_DATE_EPOCH
-  '';
-}