accrete 0.0.128__tar.gz → 0.0.130__tar.gz

{accrete-0.0.128 → accrete-0.0.130}/PKG-INFO

@@ -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 → accrete-0.0.130}/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-0.0.128 → accrete-0.0.130}/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-0.0.128 → accrete-0.0.130}/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-0.0.128 → accrete-0.0.130}/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-0.0.130/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-0.0.128 → accrete-0.0.130}/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 → accrete-0.0.130}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'accrete'
-version = '0.0.128'
+version = '0.0.130'
 authors = [
   { name='Benedikt Jilek', email='benedikt.jilek@pm.me' },
 ]