aa-structures 2.14.1__py3-none-any.whl → 2.15.0__py3-none-any.whl

{aa_structures-2.14.1.dist-info → aa_structures-2.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-structures
-Version: 2.14.1
+Version: 2.15.0
 Summary: App for managing Eve Online structures with Alliance Auth.
 Author-email: Erik Kalkoken <kalkoken87@gmail.com>
 Requires-Python: >=3.8

{aa_structures-2.14.1.dist-info → aa_structures-2.15.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
-structures/__init__.py,sha256=AKjtjd55mt0eK2ld7jC0D_ZbzHd-XxjqCBgxuBaz_vQ,204
-structures/admin.py,sha256=cA04JFghU-zIGC168fhZ5Hj_FYAQxlF6TFVDb8sgO4A,40066
+structures/__init__.py,sha256=DW_FAyoVYr5DMbDmmJQ_yaBVMMVB07QHRZP71oApKTA,204
+structures/admin.py,sha256=K7wh8mHFfGHONn7oLdqXsBAxq0rmYrwbZ7S3uIOuMtg,41303
 structures/app_settings.py,sha256=aWA2bTcv_vVwIyisx-G7GBSpfM6JDyt2MWcXKtHnjK0,6651
 structures/apps.py,sha256=MNZH9l3qWCwuS7OGiKGkBVrDzKoOFlqwDdEgyEFzxVA,195
 structures/auth_hooks.py,sha256=nRbrixFkAE5gphDokB1E8xhH8FY2VtXVwu0XMmSGBAw,1013
@@ -160,7 +160,7 @@ structures/templates/structures/templatetags/list_title.html,sha256=C2NWwo27TGfG
 structures/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/templatetags/structures.py,sha256=vSt5AnfYuo11q1SxiskT4oshSMsZ9ZgM0nYpYiMl8bA,1637
 structures/tests/__init__.py,sha256=9MrJzKr8DdsQY3-79v188pTpwqT4TDQ46vKnBJAGqic,75
-structures/tests/test_admin.py,sha256=cb_AbOanp31k-oZhaUXCqnlkUu87EgNddq_VQKbB_Dk,26839
+structures/tests/test_admin.py,sha256=aDd88Ry0ahitpYyF_wa1jG_pWJ5m5w3jsat45sBhEmo,27493
 structures/tests/test_helpers.py,sha256=BQC-4H-9-v5qW4nugqy0bkxuGlA3UO2clYY2lI2LjoY,4893
 structures/tests/test_managers_1.py,sha256=4dnlK7Le04eJUPjJc9ex5BxZWIJGAyEvdKuuYXU2gqY,34846
 structures/tests/test_managers_2.py,sha256=FISr_NT1Qnu9j1JYYTceNsUk8k9rfCTKwjKi5WUVbPs,3025
@@ -217,13 +217,13 @@ structures/views/statistics.py,sha256=7jj8b9ATsYwE7Cg6gMp-bYx29nV43GdWYun9WBggGk
 structures/views/status.py,sha256=gcahbk6dPIZDqkaNHDAsEHyDWLzicTK18Fom0A6xx3c,718
 structures/views/structures.py,sha256=Wb57jFfRa0Zxo6TxKmOCQ-jtopzPtHe0go6gnJn40CA,22584
 structures/webhooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-structures/webhooks/core.py,sha256=mP25MbQG8Yv2YayDFcR6x2V30eqXhR2q5u4SRefblf4,6573
+structures/webhooks/core.py,sha256=kvbMQ_kjJleQanlFFoiN52wIkBG_4u0ONfcHfCU5lgA,6604
 structures/webhooks/managers.py,sha256=L3G3AmsyDeif_lfpWshmAxQ61UGJ9w8i9lZaF2jbOtQ,1117
 structures/webhooks/models.py,sha256=kUkt9rnRQIJIrU9Bjcs34rvkb-TMbUubHdn-kny08kI,2067
 structures/webhooks/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 structures/webhooks/tests/test_core.py,sha256=4NcEAQgK2KhQkFOxYh2ad0S-qUWh1DNGDmLo5Mo5opI,6762
 structures/webhooks/tests/test_utils.py,sha256=ekADFv0JOEtXeqdiejbeqrABO__Q1flJHzVieQ7L9e0,459
-aa_structures-2.14.1.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
-aa_structures-2.14.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-aa_structures-2.14.1.dist-info/METADATA,sha256=9vdeZ6CyZ-97fnE0YXmYsN_w_T8TUBRfj840AVZgN0w,5972
-aa_structures-2.14.1.dist-info/RECORD,,
+aa_structures-2.15.0.dist-info/LICENSE,sha256=XZiwB_S_40_HhnvLg5xvtBb3g1oGjPrk0rpFwk8iInE,1070
+aa_structures-2.15.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+aa_structures-2.15.0.dist-info/METADATA,sha256=UZGw51TIsMgIdznKyyE9prBvlgDQQpJ3k3z4Url-DEE,5972
+aa_structures-2.15.0.dist-info/RECORD,,

structures/__init__.py

@@ -3,5 +3,5 @@
 # pylint: disable = invalid-name
 default_app_config = "structures.apps.StructuresConfig"
 
-__version__ = "2.14.1"
+__version__ = "2.15.0"
 __title__ = "Structures"

structures/admin.py

@@ -1,10 +1,13 @@
 """Admin site for Structures."""
 
+import functools
 import statistics
 from typing import Optional
 
+from django import forms
 from django.conf import settings
 from django.contrib import admin
+from django.contrib.admin.widgets import FilteredSelectMultiple
 from django.db import models
 from django.db.models import Prefetch
 from django.db.models.functions import Lower
@@ -1028,8 +1031,44 @@ class StructureAdmin(admin.ModelAdmin):
         )
 
 
+class WebhookAdminForm(forms.ModelForm):
+    owners = forms.ModelMultipleChoiceField(
+        queryset=Owner.objects.order_by(Lower("corporation__corporation_name")),
+        required=False,
+        widget=FilteredSelectMultiple(verbose_name=_("Users"), is_stacked=False),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        if self.instance and self.instance.pk:
+            self.fields["owners"].initial = self.instance.owners.all()
+
+    def save(self, commit=True):
+        webhook: Webhook = super().save(commit=False)
+
+        if commit:
+            webhook.save()
+
+        owners = self.cleaned_data["owners"]
+        if webhook.pk:
+            self._save_m2m_and_users(webhook, owners)
+        else:
+            self.save_m2m = functools.partial(
+                self._save_m2m_and_users, webhook=webhook, owners=owners
+            )
+
+        return webhook
+
+    def _save_m2m_and_users(self, webhook, owners):
+        """Save m2m relations incl. users."""
+        webhook.owners.set(owners)
+        self._save_m2m()
+
+
 @admin.register(Webhook)
 class WebhookAdmin(admin.ModelAdmin):
+    form = WebhookAdminForm
     list_display = (
         "name",
         "_ping_groups",
@@ -1057,6 +1096,7 @@ class WebhookAdmin(admin.ModelAdmin):
                     "name",
                     "url",
                     "notes",
+                    "owners",
                     "notification_types",
                     "ping_groups",
                     "is_active",

structures/tests/test_admin.py

@@ -719,3 +719,22 @@ class TestWebhookAdmin(TestCase):
         webhook.refresh_from_db()
         self.assertFalse(webhook.is_active)
         self.assertTrue(mock_message_user.called)
+
+    def test_can_assign_owner(self):
+        # given
+        owner = OwnerFactory()
+        webhook = WebhookFactory()
+        self.client.force_login(self.user)
+        data = {
+            "name": webhook.name,
+            "notification_types": NotificationType.webhook_defaults(),
+            "owners": [owner.pk],
+            "url": webhook.url,
+            "webhook_type": webhook.webhook_type,
+        }
+        r = self.client.post(
+            f"/admin/structures/webhook/{webhook.pk}/change/", data=data
+        )
+        self.assertEqual(r.status_code, 302)
+        webhook.refresh_from_db()
+        self.assertIn(owner, webhook.owners.all())

structures/webhooks/core.py

@@ -61,7 +61,7 @@ class DiscordWebhookMixin:
 
         return counter
 
-    # pylint: disable = too-many-arguments
+    # pylint: disable = too-many-positional-arguments, too-many-arguments
     def send_message(
         self,
         content: Optional[str] = None,