From 2dde72e2388247236fe38bea922c324b80448cc9 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Tue, 23 Jul 2013 17:38:25 +0200 Subject: [PATCH] =?UTF-8?q?journalise=20les=20cr=C3=A9ation=20de=20profils?= =?UTF-8?q?=20recherche=20via=20l'admin:=20import=20et=20cr=C3=A9ation=20u?= =?UTF-8?q?nitaire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appli_project/appli_socle/admin.py | 7 ++++--- appli_project/appli_socle/admin_views.py | 1 + appli_project/appli_socle/forms.py | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/appli_project/appli_socle/admin.py b/appli_project/appli_socle/admin.py index 2bc4395..c665ef5 100644 --- a/appli_project/appli_socle/admin.py +++ b/appli_project/appli_socle/admin.py @@ -122,6 +122,7 @@ class ProfilRechercheAdmin(OverloadAddForm, ModelAdmin): def cas(self, instance): ''' + Champ virtuel pour le lien à un utilisateur CAS ''' q = instance.user_ptr.utilisateur_cas.all() @@ -141,9 +142,9 @@ class ProfilRechercheAdmin(OverloadAddForm, ModelAdmin): else: request.logger.info(u"désactive le profil recherche %s", obj); else: - request.logger.info(u"crée un profil recherche pour " - u"l'identifiant CAS %s", - form.cleaned_data['identifiant_cas']) + request.record('nouveau-compte-recherche', + 'nouveau compte CAS {cas_user}', + cas_user=form.cleaned_data['identifiant_cas']) return super(ProfilRechercheAdmin, self).save_model(request, obj, form, change) def queryset(self, request): diff --git a/appli_project/appli_socle/admin_views.py b/appli_project/appli_socle/admin_views.py index 30907c9..3f90b92 100644 --- a/appli_project/appli_socle/admin_views.py +++ b/appli_project/appli_socle/admin_views.py @@ -32,6 +32,7 @@ class VueInjection(FormView): kwargs['initial'] = { 'type_d_offre': models.TypeOffre.objects.filter(id=1) } + kwargs['request'] = self.request return kwargs def get_context_data(self, **kwargs): diff --git a/appli_project/appli_socle/forms.py b/appli_project/appli_socle/forms.py index 0207943..574dfbb 100644 --- a/appli_project/appli_socle/forms.py +++ b/appli_project/appli_socle/forms.py @@ -362,6 +362,10 @@ class InjectionProfilRechercheForm(Form): queryset=models.TypeOffre.objects.all(), widget=FilteredSelectMultiple(_(u"Types d'offre"), False)) + def __init__(self, *args, **kwargs): + self.request = kwargs.pop('request', None) + super(InjectionProfilRechercheForm, self).__init__(*args, **kwargs) + def clean_fichier(self): fichier = self.cleaned_data['fichier'] if fichier is None: @@ -410,6 +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', + 'nouveau compte CAS {cas_user}', + cas_user=compte) i += 1 user.type_d_offre = self.cleaned_data['type_d_offre'] user.save()