mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-10-31 23:54:30 +01:00 
			
		
		
		
	Compare commits
	
		
			11 Commits
		
	
	
		
			4e270fabcd
			...
			ce16d25752
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | ce16d25752 | ||
|  | 821efbf78b | ||
|  | a209e0d366 | ||
|  | ef485e0628 | ||
|  | 1481aa0635 | ||
|  | 867bf9fd25 | ||
|  | 47fda0ea36 | ||
|  | 623290827a | ||
|  | a87ce625f3 | ||
|  | dde1baa25c | ||
|  | 7a7ee47e0b | 
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -48,7 +48,6 @@ backups/ | |||||||
| env/ | env/ | ||||||
| venv/ | venv/ | ||||||
| db.sqlite3 | db.sqlite3 | ||||||
| shell.nix |  | ||||||
|  |  | ||||||
| # ansibles customs host | # ansibles customs host | ||||||
| ansible/host_vars/*.yaml | ansible/host_vars/*.yaml | ||||||
|   | |||||||
| @@ -44,7 +44,8 @@ class ProfileForm(forms.ModelForm): | |||||||
|     """ |     """ | ||||||
|     A form for the extras field provided by the :model:`member.Profile` model. |     A form for the extras field provided by the :model:`member.Profile` model. | ||||||
|     """ |     """ | ||||||
|     report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency")) |     # Remove widget=forms.HiddenInput() if you want to use report frequency. | ||||||
|  |     report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency"), widget=forms.HiddenInput()) | ||||||
|  |  | ||||||
|     last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date")) |     last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date")) | ||||||
|  |  | ||||||
| @@ -76,7 +77,8 @@ class ProfileForm(forms.ModelForm): | |||||||
|     class Meta: |     class Meta: | ||||||
|         model = Profile |         model = Profile | ||||||
|         fields = '__all__' |         fields = '__all__' | ||||||
|         exclude = ('user', 'email_confirmed', 'registration_valid', ) |         # Remove ml_[asso]_registration from exclude if the concerned association uses nk20 to manage its mailing list. | ||||||
|  |         exclude = ('user', 'email_confirmed', 'registration_valid', 'ml_sport_registration', ) | ||||||
|  |  | ||||||
|  |  | ||||||
| class ImageForm(forms.Form): | class ImageForm(forms.Form): | ||||||
|   | |||||||
| @@ -26,3 +26,5 @@ MAILTO=notekfet2020@lists.crans.org | |||||||
|  00  9     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py refresh_highlighted_buttons -v 0 |  00  9     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py refresh_highlighted_buttons -v 0 | ||||||
| # Vider les tokens Oauth2 | # Vider les tokens Oauth2 | ||||||
|  00  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0 |  00  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0 | ||||||
|  | # Envoyer la liste des abonnés à la NL BDA | ||||||
|  |  00  8     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -v 0 | ||||||
							
								
								
									
										34
									
								
								shell-static.nix
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										34
									
								
								shell-static.nix
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,34 @@ | |||||||
|  | # 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 | ||||||
							
								
								
									
										23
									
								
								shell.nix
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										23
									
								
								shell.nix
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,23 @@ | |||||||
|  | # 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 | ||||||
|  |   ''; | ||||||
|  | } | ||||||
		Reference in New Issue
	
	Block a user