cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

minor fix

Browse source
This commit is contained in:
Aurélien Delobelle 2017-05-31 22:00:51 +02:00
parent 8c6d56b27c
commit 6e82a2cf88
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gestioncof/shared.py
View file

@ -15,11 +15,10 @@ class COFCASBackend(CASBackend):
return username.strip().lower() return username.strip().lower()
def configure_user(self, user): def configure_user(self, user):
# cannot use "defaults" arg clipper = user.username
profile, _ = CofProfile.objects.get_or_create(user=user) user.profile.login_clipper = clipper
profile.login_clipper = user.username user.profile.save()
profile.save() user.email = settings.CAS_EMAIL_FORMAT % clipper
user.email = settings.CAS_EMAIL_FORMAT % profile.login_clipper
user.save() user.save()
return user return user

4
kfet/views.py
View file

@ -58,9 +58,8 @@ from kfet.statistic import ScaleMixin, last_stats_manifest, tot_ventes, WeekScal
@teamkfet_required @teamkfet_required
def login_genericteam(request): def login_genericteam(request):
# Check si besoin de déconnecter l'utilisateur de CAS # Check si besoin de déconnecter l'utilisateur de CAS
profile = getattr(request.user, 'profile', None)
cas_logout = None cas_logout = None
if profile and profile.login_clipper: if request.user.profile.login_clipper:
# Récupèration de la vue de déconnexion de CAS # Récupèration de la vue de déconnexion de CAS
# Ici, car request sera modifié après # Ici, car request sera modifié après
next_page = request.META.get('HTTP_REFERER', None) next_page = request.META.get('HTTP_REFERER', None)
@ -2030,7 +2029,6 @@ def order_to_inventory(request, pk):
messages.success(request, "C'est tout bon !") messages.success(request, "C'est tout bon !")
return redirect('kfet.order') return redirect('kfet.order')
else: else:
print(formset.errors)
messages.error(request, "Corrigez les erreurs") messages.error(request, "Corrigez les erreurs")
else: else:
formset = cls_formset(initial=initial) formset = cls_formset(initial=initial)