django-pfx 1.4.dev90__tar.gz → 1.4.dev94__tar.gz

{django_pfx-1.4.dev90 → django_pfx-1.4.dev94}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev90
+Version: 1.4.dev94
 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.dev90 → django_pfx-1.4.dev94}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev90
+Version: 1.4.dev94
 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.dev90 → django_pfx-1.4.dev94}/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-02-05 08:33+0100\n"
+"POT-Creation-Date: 2025-02-17 15:16+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -59,11 +59,11 @@ msgstr ""
 "Format non valide, il peut s’agir d’un nombre en heures, « 1:05 », « :05 », "
 "« 1h 5m », « 1.5h » ou « 30m »."
 
-#: models/abstract_pfx_base_user.py:35
+#: models/abstract_pfx_base_user.py:49
 msgid "user"
 msgstr ""
 
-#: models/abstract_pfx_base_user.py:36
+#: models/abstract_pfx_base_user.py:50
 msgid "users"
 msgstr ""
 
@@ -293,11 +293,11 @@ msgstr "{model} {obj} créé."
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1164
+#: views/rest_views.py:1177
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."
 
-#: views/rest_views.py:1263 views/rest_views.py:1303
+#: views/rest_views.py:1276 views/rest_views.py:1316
 msgid "Unexpected storage error"
 msgstr "Erreur de stockage inattendue"

{django_pfx-1.4.dev90 → django_pfx-1.4.dev94}/pfx/pfxcore/models/abstract_pfx_base_user.py

@@ -1,4 +1,8 @@
-from django.contrib.auth.models import AbstractBaseUser, AbstractUser
+from django.contrib.auth.models import (
+    AbstractBaseUser,
+    AbstractUser,
+    PermissionsMixin,
+)
 from django.utils.translation import gettext_lazy as _
 
 from .pfx_models import PFXModelMixin
@@ -10,8 +14,18 @@ class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
     class Meta:
         abstract = True
 
-    def auth_json_repr(self):
-        return self.json_repr()
+    def auth_json_repr(self, **kw):
+        res = self.json_repr(
+            username=self.get_username(),
+            is_active=self.is_active,
+            **kw)
+        email_field = self.get_email_field_name()
+        if email_field != self.USERNAME_FIELD and hasattr(self, email_field):
+            res['email'] = getattr(self, email_field)
+        if isinstance(self, PermissionsMixin):
+            res['is_superuser'] = self.is_superuser
+            res['permissions'] = list(self.get_all_permissions())
+        return res
 
     @classmethod
     def auth_json_repr_schema(cls):
@@ -35,3 +49,12 @@ class AbstractPFXUser(AbstractUser, AbstractPFXBaseUser):
         verbose_name = _("user")
         verbose_name_plural = _("users")
         abstract = True
+
+    def auth_json_repr(self, **kw):
+        res = super().auth_json_repr(
+            first_name=self.first_name,
+            last_name=self.last_name,
+            is_staff=self.is_staff,
+            date_joined=self.date_joined,
+            **kw)
+        return res

{django_pfx-1.4.dev90 → django_pfx-1.4.dev94}/pfx/pfxcore/views/rest_views.py

@@ -379,12 +379,19 @@ class ModelResponseMixin(ModelMixin):
         :rtype: :class:`dict`
         """
         meta = {}
-        defaults = {} if self.request.GET.keys() else dict(fields=True)
+        defaults = {} if self.request.GET.keys() else dict(
+            fields=True, model=True)
         if get_bool(self.request.GET, 'fields', defaults.get('fields')):
             meta['fields'] = cache.get_or_set(
                 class_key(self.__class__, 'meta', 'fields'),
                 lambda: {n: f.meta() for n, f in self.get_fields().items()},
                 None)
+        if get_bool(self.request.GET, 'model', defaults.get('model')):
+            meta['model'] = {
+                'app': self.model._meta.app_label,
+                'name': self.model._meta.model_name,
+                'object': self.model._meta.object_name,
+            }
         return meta
 
     @rest_api(
@@ -619,11 +626,17 @@ class ListRestViewMixin(ModelResponseMixin):
                 class_key(self.__class__, 'meta', 'filters'),
                 lambda: [_f.meta for _f in self.filters],
                 None)
-        if get_bool(self.request.GET, 'orders', default_all):
+        if get_bool(self.request.GET, 'orders'):
             meta['orders'] = cache.get_or_set(
                 class_key(self.__class__, 'meta', 'orders'),
                 lambda: list(self.orderable_fields(self.model)),
                 None)
+        if get_bool(self.request.GET, 'model', default_all):
+            meta['model'] = {
+                'app': self.model._meta.app_label,
+                'name': self.model._meta.model_name,
+                'object': self.model._meta.object_name,
+            }
         return meta
 
     @rest_api("/meta/list", method="get", parameters=[

{django_pfx-1.4.dev90 → django_pfx-1.4.dev94}/tests/tests/basic_api_test.py

@@ -291,7 +291,7 @@ class BasicAPITest(TestAssertMixin, TestCase):
             }
         ])
 
-        response = self.client.get('/api/books/meta/list')
+        response = self.client.get('/api/books/meta/list?filters=1&orders=1')
         self.assertRC(response, 200)
 
         self.assertJE(response, 'filters.@0.items.@0', {