accrete 0.0.128__py3-none-any.whl → 0.0.130__py3-none-any.whl

accrete/admin.py

@@ -10,11 +10,13 @@ class MemberInLine(admin.TabularInline):
 class TenantAccessGroupInLine(admin.TabularInline):
 
     model = models.TenantAccessGroupRel
+    extra = 0
 
 
 class AccessGroupMemberInLine(admin.TabularInline):
 
     model = models.MemberAccessGroupRel
+    extra = 0
 
 
 class TenantAdmin(admin.ModelAdmin):
@@ -23,7 +25,7 @@ class TenantAdmin(admin.ModelAdmin):
     list_display = ('name', 'is_active', 'pk')
     search_fields = ('pk', 'name')
     list_filter = ['is_active']
-    inlines = [MemberInLine, TenantAccessGroupInLine]
+    inlines = [TenantAccessGroupInLine, MemberInLine]
 
 
 class MemberAdmin(admin.ModelAdmin):
@@ -32,15 +34,16 @@ class MemberAdmin(admin.ModelAdmin):
     list_display = ('user', 'tenant', 'is_active')
     search_fields = ('user__email', 'tenant__name')
     list_filter = ['is_active']
+    fields = ['user', 'tenant', 'is_active']
     inlines = [AccessGroupMemberInLine]
 
 
 class AccessGroupAdmin(admin.ModelAdmin):
 
     model = models.AccessGroup
-    list_display = ('name', 'code')
+    list_display = ('name', 'code', 'apply_on')
     search_fields = ('name', 'code')
-    inlines = [AccessGroupMemberInLine]
+    list_filter = ['apply_on']
 
 
 admin.site.register(models.Tenant, TenantAdmin)

accrete/contrib/ui/templates/ui/layout.html

@@ -144,8 +144,11 @@
                             <div class="is-flex is-justify-content-space-between is-flex-wrap-wrap">
                                     <div class="is-flex is-flex-wrap-wrap is-flex-grow-5 is-align-self-center py-2">
                                         {% block header_left %}
-                                            <div>
-                                                <p class="subtitle is-5 px-2 py-1 my-1">{{ title }}</p>
+                                            <div class="mr-2">
+                                                <p class="title is-5 px-2 py-1 my-1">{{ title }}</p>
+                                            </div>
+                                            <div class="buttons">
+                                                {% block header_left_buttons %}{% endblock %}
                                             </div>
                                         {% endblock %}
                                     </div>

accrete/contrib/ui/templates/ui/list.html

@@ -3,10 +3,6 @@
 {% load ui %}
 {% load partials %}
 
-{% block header_left %}
-    {{ block.super }}
-{% endblock %}
-
 {% block content_left %}
     <div class="fixed-grid has-{{ column_count }}-cols has-1-cols-mobile m-2">
         <div id="list-grid" class="grid m-0">

accrete/contrib/user/templates/user/user_form.html

@@ -1,12 +1,11 @@
 {% extends 'ui/layout.html' %}
 {% load i18n %}
 
-{% block header_left %}
-    {{ block.super }}
-    <button class="button p-2 my-1 mr-1 is-light" hx-get="{% url 'user:change_password' %}" hx-target="body" hx-swap="beforeend">
+{% block header_left_buttons %}
+    <button class="button is-light" hx-get="{% url 'user:change_password' %}" hx-target="body" hx-swap="beforeend">
         <span>{% translate 'Change Password' %}</span>
     </button>
-    <button class="button p-2 my-1 mr-1 is-light" hx-get="{% url 'user:change_email' %}" hx-target="body" hx-swap="beforeend">
+    <button class="button is-light" hx-get="{% url 'user:change_email' %}" hx-target="body" hx-swap="beforeend">
         <span>{% translate 'Change E-Mail' %}</span>
     </button>
 {% endblock %}

accrete/migrations/0005_accessgroup_apply_on_alter_member_access_groups_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.1.4 on 2025-03-06 09:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accrete', '0004_rename_accessgroupmember_memberaccessgrouprel_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='accessgroup',
+            name='apply_on',
+            field=models.CharField(choices=[('tenant', 'Tenant'), ('member', 'Member')], default='tenant', help_text='', max_length=10, verbose_name='Apply On'),
+        ),
+        migrations.AlterField(
+            model_name='member',
+            name='access_groups',
+            field=models.ManyToManyField(blank=True, through='accrete.MemberAccessGroupRel', to='accrete.accessgroup'),
+        ),
+        migrations.AlterField(
+            model_name='tenant',
+            name='access_groups',
+            field=models.ManyToManyField(blank=True, through='accrete.TenantAccessGroupRel', to='accrete.accessgroup'),
+        ),
+    ]

accrete/models.py

@@ -1,3 +1,4 @@
+from django.core.exceptions import ValidationError
 from django.db import models
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
@@ -70,7 +71,8 @@ class Tenant(models.Model):
     access_groups = models.ManyToManyField(
         to='accrete.AccessGroup',
         through='accrete.TenantAccessGroupRel',
-        through_fields=('tenant', 'access_group')
+        through_fields=('tenant', 'access_group'),
+        blank=True
     )
 
     def __str__(self):
@@ -105,7 +107,8 @@ class Member(models.Model):
     access_groups = models.ManyToManyField(
         to='accrete.AccessGroup',
         through='accrete.MemberAccessGroupRel',
-        through_fields=('member', 'access_group')
+        through_fields=('member', 'access_group'),
+        blank=True
     )
 
     objects = MemberManager()
@@ -138,6 +141,17 @@ class AccessGroup(models.Model):
         max_length=100
     )
 
+    apply_on = models.CharField(
+        verbose_name=_('Apply On'),
+        max_length=10,
+        choices=[
+            ('tenant', _('Tenant')),
+            ('member', _('Member'))
+        ],
+        default='tenant',
+        help_text=_('')
+    )
+
     def __str__(self):
         return self.name
 
@@ -169,6 +183,10 @@ class MemberAccessGroupRel(models.Model):
     def __str__(self):
         return f'{self.member} - {self.access_group}'
 
+    def clean(self):
+        if self.access_group.apply_on != 'member':
+            raise ValidationError(_('Access Group must apply on members'))
+
 
 class TenantAccessGroupRel(models.Model):
 
@@ -196,3 +214,7 @@ class TenantAccessGroupRel(models.Model):
 
     def __str__(self):
         return f'{self.tenant} - {self.access_group}'
+
+    def clean(self):
+        if self.access_group.apply_on != 'tenant':
+            raise ValidationError(_('Access Group must apply on tenants'))

{accrete-0.0.128.dist-info → accrete-0.0.130.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: accrete
-Version: 0.0.128
+Version: 0.0.130
 Summary: Django Shared Schema Multi Tenant
 Author-email: Benedikt Jilek <benedikt.jilek@pm.me>
 License: Copyright (c) 2023 Benedikt Jilek

{accrete-0.0.128.dist-info → accrete-0.0.130.dist-info}/RECORD

@@ -1,5 +1,5 @@
 accrete/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-accrete/admin.py,sha256=6NiX8_3pYIhnru5hNzvnW4xfzWsbf7gZj8Z2p38xIOk,1232
+accrete/admin.py,sha256=sK7jzjVTdAPim3TnOluRdorRZYVt2Rv8vx7Bw7dix-I,1308
 accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=1Yubvz5PVdCsX0tA7HvazhtnvCvgCoEl33_dR8SHpb8,392
 accrete/context_processors.py,sha256=DySglwyD2TwPsxhElVkYDvyBBUJabEKGMiKCLe0KN4Q,148
@@ -7,7 +7,7 @@ accrete/fields.py,sha256=9SlltB5AJvDfiAbYGWZemrqpjqDl1XNgNrhyTGoBJ2A,4693
 accrete/forms.py,sha256=H2hPQemslRLvTVV0Wl1TfUmTc5wU3Z98nQTMiLMliqo,1288
 accrete/managers.py,sha256=DevRVm7cStvlfz6TriitSINr40POCi4HNaHX48VkrMA,1620
 accrete/middleware.py,sha256=YN73WloNkN01oel9Dcj3xyhurcWoB6zMV0NT3hY8DGw,2264
-accrete/models.py,sha256=01UPWHmkWg3CcgPjImaSvS7OPh1Xx7lQ1nsJxZNN53k,4879
+accrete/models.py,sha256=vGVDso638MGL70VYwhLpNHesTVggbNNkMW0Z0siX_ys,5517
 accrete/storage.py,sha256=Jp3oE_uPMqgarjS_G49KDFrR2eSe4XuIJK9oAF_QBxk,1288
 accrete/tenant.py,sha256=GGKEhKLsC6JAkNGrMvp4l8ScsyfrDMocwJL5LBPe2Go,2307
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
@@ -197,8 +197,8 @@ accrete/contrib/ui/templates/django/forms/widgets/text.html,sha256=MSmLlQc7PsPoD
 accrete/contrib/ui/templates/django/forms/widgets/textarea.html,sha256=c9BTedqb3IkXLyVYd0p9pR8DFnsXCNGoxVBWZTk_Fic,278
 accrete/contrib/ui/templates/ui/content_right.html,sha256=XUF1tYpSKfO9FleYtJ2QmWPmwdLYxLHXdBLRa-BrFUs,221
 accrete/contrib/ui/templates/ui/form_error.html,sha256=uA8FLdZyeU0vXJHlGK3rcBqcmXb63MLPV32uQyUTak4,348
-accrete/contrib/ui/templates/ui/layout.html,sha256=l94vfodM5lGbtF3ZOBeSbesZki9LsEpfitH9bC1GEYk,12668
-accrete/contrib/ui/templates/ui/list.html,sha256=NY8DmHGl3n5O1u-_B9a_mlAck19ZmpYthzecADuc3BM,2250
+accrete/contrib/ui/templates/ui/layout.html,sha256=QTkcHPwOLdNq_HpT3AYUUCsH9yjINeN0QNbIkjFwQ8Y,12889
+accrete/contrib/ui/templates/ui/list.html,sha256=XLcZn7H3DAwCzwd5ejd5IWLFhWhXUtIhj2OvLq2cjtE,2188
 accrete/contrib/ui/templates/ui/list_update.html,sha256=mLQTCgkKfVI5jrgei-Upc1u87iXL0Q63uLzXHPwMyeo,110
 accrete/contrib/ui/templates/ui/message.html,sha256=t3bZ5EE7IgQYJroCdLKFeUkZiNbgKkErVYQm6Y3IKpg,532
 accrete/contrib/ui/templates/ui/modal.html,sha256=9Gnj5qhIJrnAPgAuIUkrSWeuYyKppywvmK1483AMhxY,1870
@@ -235,7 +235,7 @@ accrete/contrib/user/templates/user/accrete_navbar_end_dropdown.html,sha256=suPo
 accrete/contrib/user/templates/user/change_email.html,sha256=w9gBnU_O45YchY0EqD9mUK5oeDaD4cN92tHN80QjReA,815
 accrete/contrib/user/templates/user/change_password.html,sha256=1U7cI-xshsy_nhSj3TUqL3tPtYaBF17XFDgJHXXDzIw,1021
 accrete/contrib/user/templates/user/login.html,sha256=SXbxgq3baEch3ksGMsZqIws5heqAtpkdCLAFX3SLhtQ,2669
-accrete/contrib/user/templates/user/user_form.html,sha256=KVHqtoss9ttft0K4yukSr4lB4ob8Ayj-eTokh60Efn8,2683
+accrete/contrib/user/templates/user/user_form.html,sha256=fPbbUnx2URhdW9-by26q3xe3_w23de42Nj25BOC3qrs,2641
 accrete/contrib/user_registration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/contrib/user_registration/admin.py,sha256=kwmGTsg4Hii-lsw9-UaJG7AhQ4k4SPi48GSrtpZ4YR4,119
 accrete/contrib/user_registration/apps.py,sha256=mYu3fuuubfjImeJHk4D_Wd6Edw2r3oUNXGcFbAkhir4,181
@@ -253,6 +253,7 @@ accrete/migrations/0001_initial.py,sha256=azThbc8otEhxJwo8BIgOt5eC30mxXhKJLBAazZ
 accrete/migrations/0002_initial.py,sha256=dFOM7kdHlx7pVAh8cTDlZMtciN4O9Z547HAzEKnygZE,1628
 accrete/migrations/0003_remove_member_name.py,sha256=bnZrzOIXcqsoGfbqgohTN5OHm2IldnLlBz1HNJDeqKc,315
 accrete/migrations/0004_rename_accessgroupmember_memberaccessgrouprel_and_more.py,sha256=NXEKuRyIjLFXqycWB1jIZFQ0ppevMwz1I6rAr9qKrk4,1404
+accrete/migrations/0005_accessgroup_apply_on_alter_member_access_groups_and_more.py,sha256=1ZL_PG2W_5h1x1oGAUALn2Ks0kzbFusHF7XEXE1J9Pg,996
 accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/utils/__init__.py,sha256=saw9zi2XItJOPbv4fjTXOpl7StNtC803jHhapFcGx08,312
 accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
@@ -260,7 +261,7 @@ accrete/utils/forms.py,sha256=1UQoG0cXel4Tg-a_cG9doJNrl62a0JMDVEYrT5TSX1s,3383
 accrete/utils/log.py,sha256=BH0MBDweAjx30wGBO4F3sFhbgkSoEs7T1lLLjlYZNnA,407
 accrete/utils/models.py,sha256=2xTacvcpmDK_Bp4rAK7JdVLf8HU009LYNJ6eSpMgYZI,1014
 accrete/utils/views.py,sha256=AutijWetWGgjdO1PNc4gxCblT-i1fAfldNDFRbO9Sac,5012
-accrete-0.0.128.dist-info/METADATA,sha256=3HnKri4Msg5AjnVNVEP5NRET1BmJb-geQnwOmWStajk,4953
-accrete-0.0.128.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-accrete-0.0.128.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.128.dist-info/RECORD,,
+accrete-0.0.130.dist-info/METADATA,sha256=HFmr4d3mkfMC7k78non4bjbwVwS1W00cAaDawMDELCc,4953
+accrete-0.0.130.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+accrete-0.0.130.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.130.dist-info/RECORD,,