rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 15:33:45 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fix_ban' into 'master'

Browse source 
Fix des bans

See merge request federez/re2o!77
This commit is contained in:
Hugo LEVY-FALK 2018-02-20 22:28:48 +01:00
commit a4858b98c1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
users/views.py
View file

@ -358,7 +358,7 @@ def add_ban(request, user, userid):
request, request,
"Attention, cet utilisateur a deja un bannissement actif" "Attention, cet utilisateur a deja un bannissement actif"
) )
return form({'userform': ban, 'action_name': 'Ajouter un ban'}, 'users/user.html', request) return form({'userform': ban, 'action_name': 'Ajouter un ban'}, 'users/user.html', request)
@login_required @login_required
@can_edit(Ban) @can_edit(Ban)
@ -828,7 +828,7 @@ def process_passwd(request, req):
reversion.set_comment("Réinitialisation du mot de passe") reversion.set_comment("Réinitialisation du mot de passe")
req.delete() req.delete()
messages.success(request, "Le mot de passe a changé") messages.success(request, "Le mot de passe a changé")
return redirect(reverse('index')) return redirect(reverse('index'))
return form({'userform': u_form, 'action_name': 'Changer le mot de passe'}, 'users/user.html', request) return form({'userform': u_form, 'action_name': 'Changer le mot de passe'}, 'users/user.html', request)