mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-10-31 15:50:03 +01:00 
			
		
		
		
	Compare commits
	
		
			18 Commits
		
	
	
		
			78838b404c
			...
			Automation
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | a209e0d366 | ||
|  | ef485e0628 | ||
|  | 1481aa0635 | ||
|  | 867bf9fd25 | ||
|  | 47fda0ea36 | ||
|  | 623290827a | ||
|  | a87ce625f3 | ||
|  | 3559787fa7 | ||
|  | bd6ed27ae5 | ||
|  | 43dc676747 | ||
|  | caaeab6b0b | ||
|  | 54ba786884 | ||
|  | 80e109114f | ||
|  | 787005e60d | ||
|  | 414e103686 | ||
|  | 942d887c2e | ||
|  | a63c34fe37 | ||
|  | 2be6133458 | 
| @@ -44,7 +44,8 @@ class ProfileForm(forms.ModelForm): | ||||
|     """ | ||||
|     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")) | ||||
|  | ||||
| @@ -76,7 +77,8 @@ class ProfileForm(forms.ModelForm): | ||||
|     class Meta: | ||||
|         model = Profile | ||||
|         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): | ||||
|   | ||||
| @@ -31,3 +31,4 @@ class RoleAdmin(admin.ModelAdmin): | ||||
|     Admin customisation for Role | ||||
|     """ | ||||
|     list_display = ('name', ) | ||||
|     filter_horizontal = ('permissions',) | ||||
|   | ||||
| @@ -3800,6 +3800,38 @@ | ||||
|             "description": "Voir les utilisateurs adhérents au club parent" | ||||
|         } | ||||
|     }, | ||||
|     { | ||||
|         "model": "permission.permission", | ||||
|         "pk": 242, | ||||
|         "fields": { | ||||
|             "model": [ | ||||
|                 "note", | ||||
|                 "transaction" | ||||
|             ], | ||||
|             "query": "[\"AND\", {\"destination\": [\"club\", \"note\"]}, [\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 2000]}}, {\"valid\": false}]]", | ||||
|             "type": "add", | ||||
|             "mask": 2, | ||||
|             "field": "", | ||||
|             "permanent": false, | ||||
|             "description": "Créer une transaction vers la note d'un club" | ||||
|         } | ||||
|     }, | ||||
|     { | ||||
|         "model": "permission.permission", | ||||
|         "pk": 243, | ||||
|         "fields": { | ||||
|             "model": [ | ||||
|                 "member", | ||||
|                 "profile" | ||||
|             ], | ||||
|             "query": "{\"user__memberships__club\": [\"club\"], \"user__memberships__date_start__lte\": [\"today\"],\"user__memberships__date_end__gte\": [\"today\"]}", | ||||
|             "type": "view", | ||||
|             "mask": 3, | ||||
|             "field": "", | ||||
|             "permanent": false, | ||||
|             "description": "Voir les profils des membres du club" | ||||
|         } | ||||
|     }, | ||||
|     { | ||||
|         "model": "permission.role", | ||||
|         "pk": 1, | ||||
|   | ||||
| @@ -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 | ||||
| # Vider les tokens Oauth2 | ||||
|  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 | ||||
| @@ -159,11 +159,6 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|     </nav> | ||||
|     <div class="{% block containertype %}container{% endblock %} my-3"> | ||||
| 	<div id="messages"> | ||||
| 	    {% if user.is_authenticated %} | ||||
| 		<div class="alert alert-info"> | ||||
| 		    Venez au festival des Sens de l'Art du 2 au 7 décembre 🐘 ! | ||||
| 		</div> | ||||
| 	    {% endif %} | ||||
|             {% if user.is_authenticated %} | ||||
|                 {% if not user|is_member:"BDE" %} | ||||
|                     <div class="alert alert-danger"> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user