diff --git a/apps/member/views.py b/apps/member/views.py index 6d82a6ccfc58c36b7f49a3bf8052c94edd486609..d03a94e0ceb388fc57262cfc0e56d92217815191 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -51,15 +51,13 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): model = User fields = ['first_name', 'last_name', 'username', 'email'] template_name = 'member/profile_update.html' - + context_object_name = 'user_object' second_form = ProfileForm def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context['user_modified'] = context['user'] - context['user'] = self.request.user context["profile_form"] = self.second_form( - instance=context['user_modified'].profile) + instance=context['user_object'].profile) context['title'] = _("Update Profile") return context @@ -74,7 +72,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): # Si l'utilisateur cherche à modifier son pseudo, le nouveau pseudo ne doit pas être proche d'un alias existant note = NoteUser.objects.filter( alias__normalized_name=Alias.normalize(new_username)) - if note.exists() and note.get().user != self.request.user: + if note.exists() and note.get().user != self.object: form.add_error('username', _("An alias with a similar name already exists.")) @@ -83,7 +81,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView): def form_valid(self, form): profile_form = ProfileForm( data=self.request.POST, - instance=self.request.user.profile, + instance=self.object.profile, ) if form.is_valid() and profile_form.is_valid(): new_username = form.data['username'] diff --git a/templates/member/profile_detail.html b/templates/member/profile_detail.html index 48fb32ae7943e6fbb6829353a86602d94bdf36e6..6b5c127a86e3a24fe7407a2c72f7cd213f537bbb 100644 --- a/templates/member/profile_detail.html +++ b/templates/member/profile_detail.html @@ -12,7 +12,7 @@ <dd class="col-xl-6">{{ object.last_name }} {{ object.first_name }}</dd> <dt class="col-xl-6">{% trans 'username'|capfirst %}</dt> - <dd class="col-xl-6">{{ user.username }}</dd> + <dd class="col-xl-6">{{ object.username }}</dd> <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt> <dd class="col-xl-6">