From 8b8a52d2fb4c834fa887c9cf0fbfa91db455b0d3 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 24 Jul 2013 09:43:42 +0200 Subject: [PATCH] =?UTF-8?q?diff=C3=A9rencie=20les=20comptes=20recherches?= =?UTF-8?q?=20import=C3=A9s=20des=20comptes=20recherches=20cr=C3=A9=C3=A9s?= =?UTF-8?q?=20manuellement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appli_project/appli_socle/admin.py | 8 +++++--- appli_project/appli_socle/forms.py | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/appli_project/appli_socle/admin.py b/appli_project/appli_socle/admin.py index c665ef5..60039aa 100644 --- a/appli_project/appli_socle/admin.py +++ b/appli_project/appli_socle/admin.py @@ -136,16 +136,18 @@ class ProfilRechercheAdmin(OverloadAddForm, ModelAdmin): return my_urls + urls def save_model(self, request, obj, form, change): + res = super(ProfilRechercheAdmin, self).save_model(request, obj, form, change) if change: if obj.is_active: request.logger.info(u"active le profil recherche %s", obj) else: request.logger.info(u"désactive le profil recherche %s", obj); else: - request.record('nouveau-compte-recherche', + request.record('nouveau-compte-recherche-manuel', 'nouveau compte CAS {cas_user}', - cas_user=form.cleaned_data['identifiant_cas']) - return super(ProfilRechercheAdmin, self).save_model(request, obj, form, change) + cas_user=form.cleaned_data['identifiant_cas'], + new_user=obj) + return res def queryset(self, request): ''' diff --git a/appli_project/appli_socle/forms.py b/appli_project/appli_socle/forms.py index 574dfbb..540346b 100644 --- a/appli_project/appli_socle/forms.py +++ b/appli_project/appli_socle/forms.py @@ -414,9 +414,9 @@ class InjectionProfilRechercheForm(Form): except models.ProfilRecherche.DoesNotExist: self.created.append(compte) user = backend.creation_du_compte(compte, 'dauphine', ldap_resultat) - self.request.record('nouveau-compte-recherche', + self.request.record('nouveau-compte-recherche-import', 'nouveau compte CAS {cas_user}', - cas_user=compte) + cas_user=compte, new_user=user) i += 1 user.type_d_offre = self.cleaned_data['type_d_offre'] user.save()