accrete 0.0.149__py3-none-any.whl → 0.0.151__py3-none-any.whl

accrete/contrib/ui/views.py

@@ -1,9 +1,97 @@
 import json
-
 from django.contrib.auth.decorators import login_required
+from django.views.generic import View
+from django.utils.translation import gettext_lazy as _
 from django.apps import apps
 from django.http import HttpResponse
-from .filter import Filter
+from accrete.views import TenantRequiredMixin
+from accrete.models import AccessGroup
+from accrete.contrib.ui.filter import Filter
+from accrete.contrib.ui.response import WindowResponse, ModalResponse
+
+
+class TenantView(TenantRequiredMixin, View):
+
+    """
+    Base View that handles displaying access denied messages
+    to the user if member/tenant groups are missing.
+    """
+
+    def handle_tenant_group_not_set(self):
+        if not self._is_htmx():
+            return self._access_denied_page_response()
+        return self._access_denied_modal_response()
+
+    def handle_member_group_not_set(self):
+        if not self._is_htmx():
+            return self._access_denied_page_response()
+        return self._access_denied_modal_response()
+
+    def _access_denied_page_response(self):
+        return WindowResponse(
+            title=str(_('Access Denied')),
+            overview_template='mirox/base/group_not_set.html',
+            context=dict(groups=self._get_group_data()),
+            is_centered=True
+        ).response(self.request)
+
+    def _access_denied_modal_response(self):
+        res = ModalResponse(
+            template='mirox/base/group_not_set_modal.html',
+            title=str(_('Access Denied')),
+            modal_id='group-missing-modal',
+            context=dict(groups=self._get_group_data())
+        ).response(self.request)
+        res.headers['HX-Reswap'] = 'none'
+        res.headers['HX-Push-Url'] = 'false'
+        return res
+
+    def _get_group_data(self) -> dict:
+        data = {}
+        tenant_groups, member_groups = self._flat_groups()
+        if tenant_groups:
+            data.update(tenant_groups=[])
+            access_groups = AccessGroup.objects.filter(
+                code__in=tenant_groups,
+                apply_on='tenant'
+            ).all()
+            group_data = {item[0]: item[1] for item in access_groups.values_list('code', 'name')}
+            for group in self.TENANT_GROUPS:
+                if isinstance(group, tuple):
+                    data['tenant_groups'].append(' & '.join([group_data.get(g, g) for g in group]))
+                else:
+                    data['tenant_groups'].append(group_data.get(group, group))
+        if member_groups:
+            data.update(member_groups=[])
+            access_groups = AccessGroup.objects.filter(
+                code__in=member_groups,
+                apply_on='member'
+            ).all()
+            group_data = {item[0]: item[1] for item in access_groups.values_list('code', 'name')}
+            for group in self.MEMBER_GROUPS:
+                if isinstance(group, tuple):
+                    data['member_groups'].append(' & '.join([group_data.get(g, g) for g in group]))
+                else:
+                    data['member_groups'].append(group_data.get(group, group))
+        return data
+
+    def _flat_groups(self) -> tuple[list[str], list[str]]:
+        def group_list(g):
+            if isinstance(g, str):
+                return [g]
+            elif isinstance(g, tuple):
+                return [x for x in g]
+            return []
+        tenant_groups = []
+        member_groups = []
+        for group in self.TENANT_GROUPS:
+            tenant_groups.extend(group_list(group))
+        for group in self.MEMBER_GROUPS:
+            member_groups.extend(group_list(group))
+        return tenant_groups, member_groups
+
+    def _is_htmx(self):
+        return self.request.headers.get('HX-Request', 'false') == 'true'
 
 
 @login_required

accrete/contrib/ui/widgets/__init__.py

@@ -1 +1,2 @@
 from .search_select import ModelSearchSelect, ModelSearchSelectMulti
+from. date_weekday import DateWeekday

accrete/contrib/ui/widgets/date_weekday.py

@@ -0,0 +1,6 @@
+from django.forms import widgets
+
+
+class DateWeekday(widgets.DateInput):
+    template_name = 'ui/widgets/date_weekday.html'
+    input_type = 'date'

accrete/contrib/ui/widgets/search_select.py

@@ -22,7 +22,7 @@ class ModelSearchSelect(widgets.NumberInput):
         self.search_kwargs = search_kwargs or {}
         self.search_parameter = search_parameter
         self.limit = limit
-        self.hx_trigger_on_change = hx_trigger_on_change  # trigger 'change' event on the actual input field
+        self.hx_trigger_on_change = hx_trigger_on_change  # trigger htmx request on change
         self.choices = choices
 
     def get_context(self, name, value, attrs):
@@ -82,7 +82,7 @@ class ModelSearchSelectMulti(widgets.SelectMultiple):
         self.search_kwargs = search_kwargs or {}
         self.search_parameter = search_parameter
         self.limit = limit
-        self.hx_trigger_on_change = hx_trigger_on_change # trigger 'change' event on the actual input field
+        self.hx_trigger_on_change = hx_trigger_on_change  # trigger 'change' event on the actual input field
         self.choices = choices
 
     def get_context(self, name, value, attrs):

accrete/contrib/user/forms.py

@@ -24,7 +24,7 @@ class UserForm(ModelForm):
         ]
 
         widgets = {
-            'theme': forms.Select(
+            'theme': forms.RadioSelect(
                 attrs={'autocomplete': 'off'}
             )
         }

accrete/contrib/user/migrations/0009_alter_user_theme.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.1 on 2025-08-07 16:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0008_remove_user_no_email_for_managed_user_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='theme',
+            field=models.CharField(choices=[('light', 'Light'), ('dark', 'Dark'), ('custom', 'Custom')], default='light', max_length=50, verbose_name='Theme'),
+        ),
+    ]

accrete/contrib/user/migrations/0010_alter_user_theme.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.1 on 2025-08-08 06:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0009_alter_user_theme'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='theme',
+            field=models.CharField(choices=[('preset', 'Preset'), ('light', 'Light'), ('dark', 'Dark'), ('custom', 'Custom')], default='preset', max_length=50, verbose_name='Theme'),
+        ),
+    ]

accrete/contrib/user/models.py

@@ -181,10 +181,12 @@ class User(AbstractBaseUser, PermissionsMixin):
         verbose_name=_('Theme'),
         max_length=50,
         choices=[
-            ('light', 'Light'),
-            ('dark', 'Dark')
+            ('preset', _('Preset')),
+            ('light', _('Light')),
+            ('dark', _('Dark')),
+            ('custom', _('Custom'))
         ],
-        default='light'
+        default='preset'
     )
 
     objects = UserManager()

accrete/contrib/user/templates/user/login.html

@@ -1,6 +1,7 @@
 {% extends 'ui/layout.html' %}
 {% load static %}
 {% load i18n %}
+{% load ui %}
 
 {% block title %}Login{% endblock %}
 {% block theme %}data-theme="light"{% endblock %}
@@ -30,17 +31,8 @@
                         <div class="column box is-8-tablet is-offset-2-tablet is-6-desktop is-offset-3-desktop is-4-fullhd is-offset-4-fullhd p-3" data-theme="light">
                             <form method="POST" action="" hx-boost="false">
                                 {% csrf_token %}
-                                <span class="has-text-danger is-size-7">{{ form.non_field_errors }}</span>
-                                <label class="label">
-                                    <span class="has-text-black">{{ form.username.label_tag }}</span>
-                                    {{ form.username }}
-                                    <span class="has-text-danger is-size-7">{{ form.username.errors }}</span>
-                                </label>
-                                <label class="label">
-                                    <span class="has-text-black">{{ form.password.label_tag }}</span>
-                                    {{ form.password }}
-                                    <span class="has-text-danger is-size-7">{{ form.password.errors }}</span>
-                                </label>
+                                {{ form.username|wrap_form_field }}
+                                {{ form.password|wrap_form_field }}
                                 <input type="submit" class="button is-fullwidth is-success is-medium"
                                        value="{% translate 'Login' %}">
                             </form>

accrete/contrib/user/templates/user/user_preferences.html

@@ -15,29 +15,41 @@
 {% endpartialdef %}
 
 {% partialdef data %}
-    <section class="box">
+    <section class="box" x-data="{themeType: '{{ form.theme.value }}'}">
         <form id="user-form" hx-post="{% url 'user:detail' %}" hx-trigger="change changed" hx-select="#user-form" hx-swap="outerHTML" hx-select-oob="#navbar-user-name">
             {% csrf_token %}
             <div class="columns">
                 <div class="column">
                     {% include 'ui/form_error.html' %}
+                    {% include 'ui/form_error.html' with form=theme_form %}
                 </div>
             </div>
-            <div class="columns">
-                <div class="column is-6">
-                    {% translate 'Username' as username %}
-                    {{ form.username|wrap_form_field:username }}
-                    {{ form.first_name|wrap_form_field }}
-                    {{ form.last_name|wrap_form_field }}
-                </div>
-                <div class="column is-6">
-                    {% if not user.is_managed %}
-                        {{ user|wrap_model_field:'email' }}
-                    {% endif %}
-                    {{ form.language_code|wrap_form_field }}
-                    {{ form.theme|wrap_form_field }}
-                </div>
+            <div class="columns is-multiline">
+                <div class="column is-6">{{ form.username|wrap_form_field }}</div>
+                {% if not user.is_managed %}
+                    <div class="column is-6">{{ user|wrap_model_field:'email' }}</div>
+                {% else %}
+                    <div class="column is-6"></div>
+                {% endif %}
+                <div class="column is-6">{{ form.first_name|wrap_form_field }}</div>
+                <div class="column is-6">{{ form.last_name|wrap_form_field }}</div>
+                <div class="column is-6">{{ form.language_code|wrap_form_field }}</div>
+                <div class="column is-6">{{ form.theme|wrap_form_field }}</div>
             </div>
         </form>
+        <div id="theme" x-show="['custom'].includes(themeType)">
+            <p class="title is-size-5 mb-0 mt-4">{% translate 'Custom Theme' %}</p>
+            <hr class="mt-1"/>
+            <form id="theme-form" hx-post="{% url 'user:detail' %}" hx-trigger="change changed" hx-select="#theme-form" hx-swap="outerHTML">
+                {{ theme_form.user }}
+                <div class="columns is-multiline">
+                    <div class="column">{{ theme_form.color_primary|wrap_form_field }}</div>
+                    <div class="column">{{ theme_form.color_success|wrap_form_field }}</div>
+                    <div class="column">{{ theme_form.color_link|wrap_form_field }}</div>
+                    <div class="column">{{ theme_form.color_warning|wrap_form_field }}</div>
+                    <div class="column">{{ theme_form.color_danger|wrap_form_field }}</div>
+                </div>
+            </form>
+        </div>
     </section>
 {% endpartialdef %}

accrete/contrib/user/views.py

@@ -8,6 +8,8 @@ from django.conf import settings
 
 from accrete.utils import save_form
 from accrete.contrib import ui
+from accrete.contrib.ui.models import Theme
+from accrete.contrib.ui.forms import ThemeForm
 from .forms import UserForm, ChangePasswordForm, ChangeEmailForm
 
 
@@ -40,16 +42,19 @@ def user_detail(request):
         initial={'language_code': request.user.language_code},
         instance=request.user
     )
+    theme = Theme.objects.filter(user=request.user).first()
+    theme_form = ThemeForm(instance=theme, prefix='theme', initial={'user': request.user})
     refresh = False
     if request.method == 'POST':
         form = save_form(UserForm(request.POST, instance=request.user))
-        if form.is_saved:
+        theme_form = save_form(ThemeForm(request.POST, instance=theme, prefix='theme', initial={'user': request.user}))
+        if (form.is_saved or not form.has_changed()) or (theme_form.is_saved or not theme_form.has_changed()):
             refresh = True
     res = ui.WindowResponse(
         title=str(_('User Preferences')),
         overview_template='user/user_preferences.html#data',
         header_template='user/user_preferences.html#header',
-        context=dict(user=request.user, form=form),
+        context=dict(user=request.user, form=form, theme_form=theme_form),
         is_centered=True
     ).response(request, replace_body=False)
     if refresh:

accrete/fields.py

@@ -49,8 +49,10 @@ class TranslatedCharField(JSONField):
         if new_val in [None, False, '']:
             return {self.default_language: ''}
         if isinstance(new_val, dict):
-            new_val = new_val.get(language, '')
-        old_val.update({language: new_val})
+            old_val.update(new_val)
+            # new_val = new_val.get(language, '')
+        else:
+            old_val.update({language: new_val})
         if language != self.default_language and not old_val.get(self.default_language):
             old_val.update({self.default_language: new_val})
         return old_val

accrete/managers.py

@@ -47,3 +47,12 @@ class MemberManager(TenantManager):
     def get_queryset(self):
         queryset = super().get_queryset().select_related('tenant', 'user')
         return queryset
+
+
+class AccessGroupManager(models.Manager):
+
+    def tenant_groups(self):
+        return self.get_queryset().filter(apply_on='tenant')
+
+    def member_groups(self):
+        return self.get_queryset().filter(apply_on='member')

accrete/migrations/0009_alter_accessgroup_name.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.2.1 on 2025-07-31 05:12
+
+import json
+import accrete.fields
+from django.db import migrations
+from django.conf import settings
+
+
+def char_to_translated_char(apps, schema):
+    AccessGroup = apps.get_model('accrete', 'AccessGroup')
+    default_lang = getattr(settings, 'LANGUAGE_CODE', 'en-us')
+    for group in AccessGroup.objects.all():
+        group.name = json.dumps({default_lang: group.name})
+        group.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accrete', '0008_alter_member_access_groups_and_more'),
+    ]
+
+    operations = [
+        migrations.RunPython(char_to_translated_char),
+        migrations.AlterField(
+            model_name='accessgroup',
+            name='name',
+            field=accrete.fields.TranslatedCharField(verbose_name='Name'),
+        ),
+    ]

accrete/models.py

@@ -3,7 +3,8 @@ from django.db import models
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 from accrete.tenant import get_tenant
-from accrete.managers import TenantManager, MemberManager
+from accrete.managers import TenantManager, MemberManager, AccessGroupManager
+from accrete.fields import TranslatedCharField
 
 
 class TenantModel(models.Model):
@@ -131,9 +132,10 @@ class AccessGroup(models.Model):
             )
         ]
 
-    name = models.CharField(
-        verbose_name=_('Name'),
-        max_length=255
+    objects = AccessGroupManager()
+
+    name = TranslatedCharField(
+        verbose_name=_('Name')
     )
 
     description = models.TextField(

accrete/views.py

@@ -1,6 +1,8 @@
 import os
 from functools import wraps
-from django.http import HttpResponse, HttpResponseNotFound
+from typing import Callable
+
+from django.http import HttpResponse, HttpResponseNotFound, HttpResponseForbidden, HttpRequest
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.views import login_required
 from django.core.exceptions import ImproperlyConfigured
@@ -104,6 +106,9 @@ class TenantRequiredMixin(LoginRequiredMixin):
 def tenant_required(
         tenant_groups: list[str | tuple[str]] = None,
         member_groups: list[str | tuple[str]] = None,
+        group_missing_action: str | Callable[[
+            HttpRequest, list[str | tuple[str]], list[str | tuple[str]]
+        ], HttpResponse] = None,
         redirect_field_name: str = None,
         login_url: str = None
 ):
@@ -114,30 +119,37 @@ def tenant_required(
             login_url=login_url
         )
         def _wrapped_view(request, *args, **kwargs):
+
+            def handle_group_missing():
+                if callable(group_missing_action):
+                    return group_missing_action(
+                        request, tenant_groups, member_groups
+                    )
+                return (
+                    redirect(config.ACCRETE_GROUP_NOT_SET_URL)
+                    if config.ACCRETE_GROUP_NOT_SET_URL
+                    else HttpResponseForbidden()
+                )
+
             tenant = request.tenant
             if not tenant:
                 return redirect(config.ACCRETE_TENANT_NOT_SET_URL)
-            redirect_url = None
             for tenant_group in (tenant_groups or []):
-                if (
-                    (isinstance(tenant_group, tuple) and all([
-                        tenant_has_group(g) for g in tenant_group
-                    ]))
-                    or tenant_has_group(tenant_group)
-                ):
-                    return f(request, *args, **kwargs)
-                redirect_url = config.ACCRETE_GROUP_NOT_SET_URL
+                if isinstance(tenant_group, tuple) and all([
+                    tenant_has_group(g) for g in tenant_group
+                ]):
+                    break
+                elif isinstance(tenant_group, str) and tenant_has_group(tenant_group):
+                    break
+                return handle_group_missing()
             for member_group in (member_groups or []):
-                if (
-                    (isinstance(member_group, tuple) and all([
-                        member_has_group(g) for g in member_group
-                    ]))
-                    or member_has_group(member_group)
-                ):
-                    return f(request, *args, **kwargs)
-                redirect_url = config.ACCRETE_GROUP_NOT_SET_URL
-            if redirect_url:
-                return redirect(redirect_url)
+                if isinstance(member_group, tuple) and all([
+                    member_has_group(g) for g in member_group
+                ]):
+                    break
+                elif isinstance(member_group, str) and member_has_group(member_group):
+                    break
+                return handle_group_missing()
             return f(request, *args, **kwargs)
         return _wrapped_view
     return decorator

{accrete-0.0.149.dist-info → accrete-0.0.151.dist-info}/METADATA

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