django-pfx 1.4.dev74__tar.gz → 1.4.dev76__tar.gz

{django_pfx-1.4.dev74 → django_pfx-1.4.dev76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev74
+Version: 1.4.dev76
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev74 → django_pfx-1.4.dev76}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev74
+Version: 1.4.dev76
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev74 → django_pfx-1.4.dev76}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-01-22 16:36+0100\n"
+"POT-Creation-Date: 2025-01-29 12:33+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -103,7 +103,7 @@ msgstr "Compte HOTP"
 msgid "HOTP expiry"
 msgstr "Expiration HOTP"
 
-#: models/otp_user_mixin.py:29 views/authentication_views.py:491
+#: models/otp_user_mixin.py:29 views/authentication_views.py:492
 msgid "OTP enabled"
 msgstr "OTP activé"
 
@@ -204,7 +204,7 @@ msgstr "Bienvenue sur %(site_name)s."
 msgid "Welcome on %(site_name)s"
 msgstr "Bienvenue sur %(site_name)s"
 
-#: views/authentication_views.py:81
+#: views/authentication_views.py:82
 #, python-brace-format
 msgid ""
 "Your connection is temporarily disabled after several unsuccessful attempts, "
@@ -213,43 +213,43 @@ msgstr ""
 "Votre connexion est temporairement désactivée après plusieurs tentatives "
 "infructueuses, veuillez réessayer dans {seconds} secondes."
 
-#: views/authentication_views.py:173
+#: views/authentication_views.py:174
 msgid "Successful login"
 msgstr "Connexion réussie"
 
-#: views/authentication_views.py:243 views/authentication_views.py:408
+#: views/authentication_views.py:244 views/authentication_views.py:409
 msgid "password updated successfully"
 msgstr "le mot de passe a été mis à jour avec succès"
 
-#: views/authentication_views.py:248
+#: views/authentication_views.py:249
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: views/authentication_views.py:251 views/authentication_views.py:417
+#: views/authentication_views.py:252 views/authentication_views.py:418
 msgid "Empty password is not allowed"
 msgstr "Un mot de passe vide n’est pas autorisé"
 
-#: views/authentication_views.py:342
+#: views/authentication_views.py:343
 msgid "User and token are valid"
 msgstr "L'utilisateur et le token sont valides"
 
-#: views/authentication_views.py:344
+#: views/authentication_views.py:345
 msgid "User or token is invalid"
 msgstr "L'utilisateur ou le token est invalide"
 
-#: views/authentication_views.py:451
+#: views/authentication_views.py:452
 msgid "OTP is already enabled"
 msgstr "OTP est déjà activé"
 
-#: views/authentication_views.py:492 views/authentication_views.py:528
+#: views/authentication_views.py:493 views/authentication_views.py:529
 msgid "Invalid code"
 msgstr "Code invalide"
 
-#: views/authentication_views.py:527
+#: views/authentication_views.py:528
 msgid "OTP disabled"
 msgstr "OTP désactivé"
 
-#: views/authentication_views.py:787
+#: views/authentication_views.py:789
 msgid ""
 "If the email address you entered is correct, you will receive an email from "
 "us with instructions to reset your password."
@@ -258,7 +258,7 @@ msgstr ""
 "un courrier électronique de notre part contenant des instructions pour "
 "réinitialiser votre mot de passe."
 
-#: views/authentication_views.py:861
+#: views/authentication_views.py:863
 msgid "A new authentication code has been sent by email."
 msgstr "Un nouveau code d'authentification a été envoyé par e-mail."
 
@@ -273,21 +273,21 @@ msgid "{obj} cannot be deleted because it is referenced by other objects."
 msgstr ""
 "{obj} ne peut pas être supprimé car il est référencé par d’autres objets."
 
-#: views/rest_views.py:342
+#: views/rest_views.py:327
 #, python-brace-format
 msgid "{model} {obj} created."
 msgstr "{model} {obj} créé."
 
-#: views/rest_views.py:343
+#: views/rest_views.py:328
 #, python-brace-format
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1141
+#: views/rest_views.py:1153
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."
 
-#: views/rest_views.py:1240 views/rest_views.py:1280
+#: views/rest_views.py:1252 views/rest_views.py:1292
 msgid "Unexpected storage error"
 msgstr "Erreur de stockage inattendue"

{django_pfx-1.4.dev74 → django_pfx-1.4.dev76}/pfx/pfxcore/views/authentication_views.py

@@ -10,6 +10,7 @@ from django.contrib.auth.tokens import default_token_generator
 from django.core.exceptions import ValidationError
 from django.core.mail import EmailMultiAlternatives
 from django.core.validators import validate_email
+from django.db import transaction
 from django.template import loader
 from django.utils.decorators import method_decorator
 from django.utils.encoding import force_bytes
@@ -724,8 +725,9 @@ class SignupView(SendMessageTokenMixin, CreateRestViewMixin, BaseRestView):
         super().validate(obj, **kwargs)
 
     def is_valid(self, obj, created=True, **kwargs):
-        r = super().is_valid(obj, created, **kwargs)
-        self.send_token_message(obj)
+        with transaction.atomic():
+            r = super().is_valid(obj, created, **kwargs)
+            self.send_token_message(obj)
         return r
 
 

{django_pfx-1.4.dev74 → django_pfx-1.4.dev76}/pfx/pfxcore/views/fields.py

@@ -117,7 +117,8 @@ class ViewField:
                 dict(label=_(v), value=k) for k, v in self.choices.items()]
         if self.related_model:
             res['model'] = self.related_model._meta.label
-            res['api'] = self.related_model_api or self.related_model.api
+            res['api'] = self.related_model_api or getattr(
+                self.related_model, 'api', None)
         res['readonly'] = dict(
             post=self.readonly_create,
             put=self.readonly_update)
@@ -362,14 +363,15 @@ class VF:
             self, name, verbose_name=None, field_type=None, alias=None,
             readonly=False, readonly_create=False, readonly_update=False,
             choices=None, select_related=None, prefetch_related=None,
-            json_repr=None):
+            json_repr=None, related_model=None, related_model_api=None):
         self.kwargs = dict(
             name=name, verbose_name=verbose_name, field_type=field_type,
             alias=alias,
             readonly=readonly, readonly_create=readonly_create,
             readonly_update=readonly_update, choices=choices,
             select_related=select_related, prefetch_related=prefetch_related,
-            json_repr=json_repr)
+            json_repr=json_repr, related_model=related_model,
+            related_model_api=related_model_api)
 
     def to_field(self, model):
         return ViewField.from_name(model, **self.kwargs)

{django_pfx-1.4.dev74 → django_pfx-1.4.dev76}/pfx/pfxcore/views/rest_views.py

@@ -314,6 +314,23 @@ class ModelResponseMixin(ModelMixin):
         """
         obj.full_clean(**kwargs)
 
+    def is_valid_response_meta(self, obj, created=False):
+        """Prepare the defaut meta for is_valid responce.
+
+        :param obj: The object instance
+        :param created: If object instance is created
+        :returns: The JSON response
+        :rtype: :class:`JsonResponse`
+        """
+        message = (
+                created and
+                _("{model} {obj} created.") or
+                _("{model} {obj} updated."))
+        return dict(
+            created=created,
+            message=f(
+                message, model=self.model_name, obj=object))
+
     def is_valid(self, obj, created=False, rel_data=None):
         """Persist an object instance changes and build default response.
 
@@ -337,14 +354,9 @@ class ModelResponseMixin(ModelMixin):
                     getattr(obj, k).set(v)
         else:
             obj.save()
-        message = (
-                created and
-                _("{model} {obj} created.") or
-                _("{model} {obj} updated."))
-        object = self.get_object(pk=obj.pk)
+        obj = self.get_object(pk=obj.pk)
         return self.response(
-            object, message=f(
-                message, model=self.model_name, obj=object))
+            obj, **self.is_valid_response_meta(obj, created=created))
 
     def is_invalid(self, obj, errors):
         """Build a 422 response for invalid object instance.