From 0ea0d7770756c34fde0d9ea33ad005adb9dcf32e Mon Sep 17 00:00:00 2001
From: Pierre-antoine Comby <comby@crans.org>
Date: Thu, 27 Feb 2020 20:56:06 +0100
Subject: [PATCH] fix #27
---
apps/member/views.py | 10 ++++------
templates/member/profile_detail.html | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/apps/member/views.py b/apps/member/views.py
index 6d82a6cc..d03a94e0 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 48fb32ae..6b5c127a 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">
--
GitLab