arthexis 0.1.5__tar.gz → 0.1.6__tar.gz

{arthexis-0.1.5 → arthexis-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.5
+Version: 0.1.6
 Summary: Django-based MESH system
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: MIT

{arthexis-0.1.5 → arthexis-0.1.6}/arthexis.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arthexis
-Version: 0.1.5
+Version: 0.1.6
 Summary: Django-based MESH system
 Author-email: "Rafael J. Guillén-Osorio" <tecnologia@gelectriic.com>
 License-Expression: MIT

{arthexis-0.1.5 → arthexis-0.1.6}/arthexis.egg-info/SOURCES.txt

@@ -102,6 +102,7 @@ tests/test_odoo_profile.py
 tests/test_odoo_profile_admin.py
 tests/test_offline.py
 tests/test_package_release_admin_actions.py
+tests/test_post_office_admin_group.py
 tests/test_pypi_token.py
 tests/test_readme_language.py
 tests/test_reference_qr_code.py

{arthexis-0.1.5 → arthexis-0.1.6}/core/admin.py

@@ -38,7 +38,7 @@ from .models import (
     Reference,
     OdooProfile,
     FediverseProfile,
-    EmailInbox,
+    EmailInbox as CoreEmailInbox,
     Package,
     PackageRelease,
     ReleaseManager,
@@ -380,6 +380,14 @@ class FediverseProfileAdmin(admin.ModelAdmin):
                 self.message_user(request, f"{profile}: {exc}", level=messages.ERROR)
 
 
+class EmailInbox(CoreEmailInbox):
+    class Meta:
+        proxy = True
+        app_label = "post_office"
+        verbose_name = CoreEmailInbox._meta.verbose_name
+        verbose_name_plural = CoreEmailInbox._meta.verbose_name_plural
+
+
 class EmailInboxAdminForm(forms.ModelForm):
     """Admin form for :class:`core.models.EmailInbox` with hidden password."""
 
@@ -390,7 +398,7 @@ class EmailInboxAdminForm(forms.ModelForm):
     )
 
     class Meta:
-        model = EmailInbox
+        model = CoreEmailInbox
         fields = "__all__"
 
     def __init__(self, *args, **kwargs):
@@ -445,6 +453,10 @@ class EmailInboxAdmin(admin.ModelAdmin):
         ),
     )
 
+    def save_model(self, request, obj, form, change):
+        super().save_model(request, obj, form, change)
+        obj.__class__ = EmailInbox
+
     @admin.action(description="Test selected inboxes")
     def test_connection(self, request, queryset):
         for inbox in queryset:

{arthexis-0.1.5 → arthexis-0.1.6}/nodes/admin.py

@@ -18,7 +18,7 @@ from .actions import NodeAction
 
 from .models import (
     Node,
-    EmailOutbox,
+    EmailOutbox as NodeEmailOutbox,
     NodeRole,
     ContentSample,
     NodeTask,
@@ -181,10 +181,22 @@ class NodeAdmin(admin.ModelAdmin):
         return redirect(reverse("admin:nodes_node_change", args=[node_id]))
 
 
+class EmailOutbox(NodeEmailOutbox):
+    class Meta:
+        proxy = True
+        app_label = "post_office"
+        verbose_name = NodeEmailOutbox._meta.verbose_name
+        verbose_name_plural = NodeEmailOutbox._meta.verbose_name_plural
+
+
 @admin.register(EmailOutbox)
 class EmailOutboxAdmin(admin.ModelAdmin):
     list_display = ("node", "host", "port", "username", "use_tls", "use_ssl")
 
+    def save_model(self, request, obj, form, change):
+        super().save_model(request, obj, form, change)
+        obj.__class__ = EmailOutbox
+
 
 class NodeRoleAdminForm(forms.ModelForm):
     nodes = forms.ModelMultipleChoiceField(

{arthexis-0.1.5 → arthexis-0.1.6}/nodes/tests.py

@@ -560,11 +560,6 @@ class NetMessageAdminTests(TransactionTestCase):
 class LastNetMessageViewTests(TestCase):
     def setUp(self):
         self.client = Client()
-        User = get_user_model()
-        self.user = User.objects.create_user(
-            username="lastmsg", password="pwd"
-        )
-        self.client.force_login(self.user)
         NodeRole.objects.get_or_create(name="Terminal")
 
     def test_returns_latest_message(self):

{arthexis-0.1.5 → arthexis-0.1.6}/nodes/views.py

@@ -252,7 +252,6 @@ def net_message(request):
     return JsonResponse({"status": "propagated", "complete": msg.complete})
 
 
-@api_login_required
 def last_net_message(request):
     """Return the most recent :class:`NetMessage`."""
 

{arthexis-0.1.5 → arthexis-0.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "arthexis"
-version = "0.1.5"
+version = "0.1.6"
 description = "Django-based MESH system"
 requires-python = ">=3.10"
 license = "MIT"

{arthexis-0.1.5 → arthexis-0.1.6}/tests/test_email_inbox_search_action.py

@@ -4,7 +4,7 @@ from unittest.mock import patch
 from django.contrib.admin.sites import AdminSite
 from django.test import TestCase, RequestFactory
 
-from core.admin import EmailInboxAdmin
+from core.admin import EmailInboxAdmin, EmailInbox as AdminEmailInbox
 from core.models import EmailInbox, User
 
 
@@ -93,11 +93,13 @@ class EmailInboxSearchTests(TestCase):
             use_ssl=True,
         )
         site = AdminSite()
-        ma = EmailInboxAdmin(EmailInbox, site)
+        ma = EmailInboxAdmin(AdminEmailInbox, site)
         factory = RequestFactory()
         request = factory.post("/", {"apply": "yes", "subject": "S"})
         request.user = admin
-        response = ma.search_inbox(request, EmailInbox.objects.filter(id=inbox.id))
+        response = ma.search_inbox(
+            request, AdminEmailInbox.objects.filter(id=inbox.id)
+        )
         self.assertEqual(response.status_code, 200)
         content = response.render().content.decode()
         self.assertIn("S", content)

arthexis-0.1.6/tests/test_post_office_admin_group.py

@@ -0,0 +1,33 @@
+from django.test import TestCase
+from django.contrib.auth import get_user_model
+from django.urls import reverse
+from django.contrib.admin.sites import site
+
+from core.admin import EmailInbox as PostOfficeEmailInbox
+from nodes.admin import EmailOutbox as PostOfficeEmailOutbox
+
+
+class PostOfficeAdminGroupTests(TestCase):
+    def setUp(self):
+        User = get_user_model()
+        self.admin = User.objects.create_superuser(
+            username="po-admin", password="pwd", email="admin@example.com"
+        )
+        self.client.force_login(self.admin)
+
+    def test_models_registered(self):
+        registry = site._registry
+        self.assertIn(PostOfficeEmailInbox, registry)
+        self.assertIn(PostOfficeEmailOutbox, registry)
+        self.assertEqual(
+            registry[PostOfficeEmailInbox].model._meta.app_label, "post_office"
+        )
+        self.assertEqual(
+            registry[PostOfficeEmailOutbox].model._meta.app_label, "post_office"
+        )
+
+    def test_admin_index_shows_post_office_group(self):
+        response = self.client.get(reverse("admin:index"))
+        self.assertContains(response, "Post Office")
+        self.assertContains(response, "Email Inboxes")
+        self.assertContains(response, "Email Outboxes")