Skip to content
Snippets Groups Projects
Commit 0ea0d777 authored by Pierre-antoine Comby's avatar Pierre-antoine Comby
Browse files

fix #27

parent c372b658
No related branches found
No related tags found
1 merge request!30fix #27
Pipeline #7816 passed with warnings with stages
in 3 minutes and 48 seconds
......@@ -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']
......
......@@ -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">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment