Produits Entr'ouvert » Authentic 2

Frédéric Péters a écrit :

Ça envoie le même message "Vous avez demandé ..." alors bien sûr on dira que depuis le backoffice même si c'est un agent il le fait à la demande d'un usager mais pour d'autres templates on a des messages différents (ex: "An administrator has created you an account...").

Je vais gérer ça dans #20333 qui arrive (j'ajoute une version HTML pour ce mail, j'en profiterai pour gérer cet ajustement, j'ai ajouté un commentaire sur le ticket pour ne pas oublier).

Aussi, j'ajouterais un message dans la boite de dialogue pour annoncer à l'agent que ça enverra un message demandant validation à l'usager.

Patch du patch (intégré dans le nouveau 0003):

diff --git a/src/authentic2/manager/templates/authentic2/manager/user_change_email.html b/src/authentic2/manager/templates/authentic2/manager/user_change_email.html
new file mode 100644
index 0000000..0eec0f2
--- /dev/null
+++ b/src/authentic2/manager/templates/authentic2/manager/user_change_email.html
@@ -0,0 +1,11 @@
+{% extends "authentic2/manager/form.html" %}
+{% load i18n %}
+
+{% block beforeform %}
+  <p>
+      {% blocktrans %}User's email will not be changed immediately. First an email will be sent to this
+      new email address containing a link on which the user's will have to click to verify that it owns
+      the email address, then it will be changed.{% endblocktrans %}
+  </p>
+  {{ block.super }}
+{% endblock %}
diff --git a/src/authentic2/manager/user_views.py b/src/authentic2/manager/user_views.py
index 104629e..74e904c 100644
--- a/src/authentic2/manager/user_views.py
+++ b/src/authentic2/manager/user_views.py
@@ -332,7 +332,7 @@ user_change_password = UserChangePasswordView.as_view()

 class UserChangeEmailView(BaseEditView):
-    template_name = 'authentic2/manager/form.html'
+    template_name = 'authentic2/manager/user_change_email.html'
     model = get_user_model()
     form_class = UserChangeEmailForm
     permissions = ['custom_user.change_email_user']

Diff:

it rediff --git a/src/authentic2/manager/templates/authentic2/manager/user_change_email_notification_body.txt b/src/authentic2/manager/templates/authentic2/manager/user_change_email_notification_body.txt
new file mode 100644
index 0000000..8613504
--- /dev/null
+++ b/src/authentic2/manager/templates/authentic2/manager/user_change_email_notification_body.txt
@@ -0,0 +1,35 @@
+{% load i18n %}{% autoescape off %}{% if email_is_not_unique%}{% blocktrans with name=user.get_short_name old_email=user.email %}Hi {{ name }} !
+
+An administrator requested for changing your email on {{ domain }} from:
+
+  {{ old_email }}
+
+to:
+
+  {{ email }}
+
+But this email is already linked to another account.
+
+You can recover this account password using the password reset form:
+
+  {{ password_reset_url }}
+
+--
+{{ domain }}{% endblocktrans %}{% else %}{% blocktrans with name=user.get_short_name old_email=user.email %}Hi {{ name }} !
+
+And administrator requested for changing your email on {{ domain }} from:
+
+  {{ old_email }}
+
+to:
+
+  {{ email }}
+
+To validate this change please click on the following link:
+
+  {{ link }}
+
+This link will be valid for {{ token_lifetime }}.
+
+--
+{{ domain }}{% endblocktrans %}{% endif %}{% endautoescape %}
diff --git a/src/authentic2/manager/templates/authentic2/manager/user_change_email_notification_subject.txt b/src/authentic2/manager/templates/authentic2/manager/user_change_email_notification_subject.txt
new file mode 100644
index 0000000..6fab6fa
--- /dev/null
+++ b/src/authentic2/manager/templates/authentic2/manager/user_change_email_notification_subject.txt
@@ -0,0 +1 @@
+{% load i18n %}{% autoescape off %}{% blocktrans %}Change email on {{ domain }} requested by an administrator{% endblocktrans %}{% endautoescape %}
diff --git a/src/authentic2/manager/user_views.py b/src/authentic2/manager/user_views.py
index 74e904c..fd0367a 100644
--- a/src/authentic2/manager/user_views.py
+++ b/src/authentic2/manager/user_views.py
@@ -353,7 +353,8 @@ class UserChangeEmailView(BaseEditView):
         email = form.cleaned_data['email']
         hooks.call_hooks('event', name='manager-change-email-request', user=self.request.user,
                          instance=form.instance, form=form, email=email)
-        send_email_change_mail(self.object, email, request=self.request)
+        send_email_change_mail(self.object, email, request=self.request,
+                               template_names=['authentic2/manager/user_change_email_notification'])
         return response

 user_change_email = UserChangeEmailView.as_view()

Dernier ajustement: renommage de send_email_change_mail en send_email_change_email (pour garder le nom d'avant en fait, et parce que mail c'est pas le bon nom) et correction à l'API de changement d'email qui utilisait toujours l'implémentation sur EmailChangeView. Tous les tests passent maintenant.

Il y un <div class="other_actions"> qui se trouve dans la popup et lui fait un espace vide sur la droite.

Point de stylé déplacé dans #20509, ack pour celui-ci ainsi.

Appliqué par commit authentic2|15878fbfaab5b466a50972812b0ae6f3641a9c31.