mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-10-31 07:49:57 +01:00 
			
		
		
		
	Compare commits
	
		
			17 Commits
		
	
	
		
			darbonne
			...
			7826811528
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 7826811528 | ||
|  | f6649f155a | ||
|  | 5707abf9e2 | ||
|  | 056c4029f8 | ||
|  | bfd865b3e3 | ||
|  | 6ceb43cb66 | ||
|  | 9635004520 | ||
|  | 05e21ed229 | ||
|  | b2ccc4aede | ||
|  | 6229652dea | ||
|  | eee87dcf13 | ||
|  | bcf21507e5 | ||
|  | 6127ced143 | ||
|  | f63e5dcb5a | ||
|  | 73aa0098bf | ||
|  | 694a5c7bd8 | ||
|  | a4480258d7 | 
| @@ -26,6 +26,7 @@ from note_kfet.middlewares import _set_current_request | |||||||
| from permission.backends import PermissionBackend | from permission.backends import PermissionBackend | ||||||
| from permission.models import Role | from permission.models import Role | ||||||
| from permission.views import ProtectQuerysetMixin, ProtectedCreateView | from permission.views import ProtectQuerysetMixin, ProtectedCreateView | ||||||
|  | from django import forms | ||||||
|  |  | ||||||
| from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \ | from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \ | ||||||
|     CustomAuthenticationForm, MembershipRolesForm |     CustomAuthenticationForm, MembershipRolesForm | ||||||
| @@ -72,11 +73,19 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): | |||||||
|         form.fields['email'].required = True |         form.fields['email'].required = True | ||||||
|         form.fields['email'].help_text = _("This address must be valid.") |         form.fields['email'].help_text = _("This address must be valid.") | ||||||
|  |  | ||||||
|         if PermissionBackend.check_perm(self.request, "member.change_profile", context['user_object'].profile): |         profile_form = self.profile_form(instance=context['user_object'].profile, | ||||||
|             context['profile_form'] = self.profile_form(instance=context['user_object'].profile, |                                          data=self.request.POST if self.request.POST else None) | ||||||
|                                                         data=self.request.POST if self.request.POST else None) |         if not self.object.profile.report_frequency: | ||||||
|             if not self.object.profile.report_frequency: |             del profile_form.fields["last_report"] | ||||||
|                 del context['profile_form'].fields["last_report"] |  | ||||||
|  |         fields_to_check = list(profile_form.fields.keys()) | ||||||
|  |  | ||||||
|  |         # Delete the fields for which the user does not have the permission to modify | ||||||
|  |         for field_name in fields_to_check: | ||||||
|  |             if not PermissionBackend.check_perm(self.request, f"member.change_profile_{field_name}", context['user_object'].profile): | ||||||
|  |                 profile_form.fields[field_name].widget = forms.HiddenInput() | ||||||
|  |  | ||||||
|  |         context['profile_form'] = profile_form | ||||||
|  |  | ||||||
|         return context |         return context | ||||||
|  |  | ||||||
|   | |||||||
| @@ -3832,6 +3832,74 @@ | |||||||
|             "description": "Voir les profils des membres du club" |             "description": "Voir les profils des membres du club" | ||||||
|         } |         } | ||||||
|     }, |     }, | ||||||
|  |     { | ||||||
|  |         "model": "permission.permission", | ||||||
|  |         "pk": 244, | ||||||
|  |         "fields": { | ||||||
|  |             "model": [ | ||||||
|  |                 "member", | ||||||
|  |                 "profile" | ||||||
|  |             ], | ||||||
|  |             "query": "{}", | ||||||
|  |             "type": "change", | ||||||
|  |             "mask": 3, | ||||||
|  |             "field": "ml_events_registration", | ||||||
|  |             "permanent": false, | ||||||
|  |             "description": "Modifier l'abonnement à la Newsletter BDE pour n'importe quel profil" | ||||||
|  |         } | ||||||
|  |     }, | ||||||
|  |     { | ||||||
|  |         "model": "permission.permission", | ||||||
|  |         "pk": 245, | ||||||
|  |         "fields": { | ||||||
|  |             "model": [ | ||||||
|  |                 "member", | ||||||
|  |                 "profile" | ||||||
|  |             ], | ||||||
|  |             "query": "{}", | ||||||
|  |             "type": "change", | ||||||
|  |             "mask": 3, | ||||||
|  |             "field": "ml_art_registration", | ||||||
|  |             "permanent": false, | ||||||
|  |             "description": "Modifier l'abonnement à la Newsletter Art pour n'importe quel profil" | ||||||
|  |         } | ||||||
|  |     }, | ||||||
|  |     { | ||||||
|  |         "model": "permission.permission", | ||||||
|  |         "pk": 246, | ||||||
|  |         "fields": { | ||||||
|  |             "model": [ | ||||||
|  |                 "member", | ||||||
|  |                 "profile" | ||||||
|  |             ], | ||||||
|  |             "query": "{}", | ||||||
|  |             "type": "change", | ||||||
|  |             "mask": 3, | ||||||
|  |             "field": "ml_sport_registration", | ||||||
|  |             "permanent": false, | ||||||
|  |             "description": "Modifier l'abonnement à la Newsletter Sport pour n'importe quel profil" | ||||||
|  |         } | ||||||
|  |     }, | ||||||
|  |     { | ||||||
|  |         "model": "permission.permission", | ||||||
|  |         "pk": 247, | ||||||
|  |         "fields": { | ||||||
|  |             "model": [ | ||||||
|  |                 "member", | ||||||
|  |                 "profile" | ||||||
|  |             ], | ||||||
|  |             "query": "{}", | ||||||
|  |             "type": "view", | ||||||
|  |             "mask": 3, | ||||||
|  |             "field": [ | ||||||
|  |                 "ml_events_registration", | ||||||
|  |                 "ml_art_registration", | ||||||
|  |                 "ml_sport_registration" | ||||||
|  |             ], | ||||||
|  |             "permanent": false, | ||||||
|  |             "description": "Voir les abonnements aux Newsletters de n'importe quel profil" | ||||||
|  |         } | ||||||
|  |     }, | ||||||
|     { |     { | ||||||
|         "model": "permission.role", |         "model": "permission.role", | ||||||
|         "pk": 1, |         "pk": 1, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user