accrete 0.0.57__tar.gz → 0.0.59__tar.gz

{accrete-0.0.57 → accrete-0.0.59}/PKG-INFO

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

{accrete-0.0.57 → accrete-0.0.59}/accrete/contrib/ui/context.py

@@ -100,7 +100,6 @@ def default_table_context(model: Type[Model], params: dict, queryset=None, **kwa
     return ctx
 
 
-
 @dataclass
 class ListContext(Context):
 

{accrete-0.0.57 → accrete-0.0.59}/accrete/contrib/ui/filter.py

@@ -158,7 +158,9 @@ class Filter:
             'PositiveSmallIntegerField': self.int_param,
             'DateTimeField': self.date_time_param,
             'DateField': self.date_param,
-            'ForeignKey': self.foreign_key_param
+            'ForeignKey': self.foreign_key_param,
+            'FileField': self.file_param,
+            'ImageField': self.file_param
         }
 
     def parse_choices(self, choices):
@@ -269,6 +271,9 @@ class Filter:
             return self.null_param(key, value)
         return ''
 
+    def file_param(self, key, value):
+        return self.null_param(key, value)
+
     def null_param(self, key, value):
         options = self.parse_choices([
             ('true', _('True')),

{accrete-0.0.57 → accrete-0.0.59}/accrete/contrib/ui/static/js/ui.js

@@ -24,3 +24,7 @@ function setDropDown(el) {
         }
     })
 }
+
+function removeModal(modalId) {
+    document.getElementById(modalId).remove()
+}

{accrete-0.0.57 → accrete-0.0.59}/accrete/contrib/ui/templates/ui/form.html

@@ -6,7 +6,7 @@
         <div id="form-content" class="column p-0 is-8-desktop">
             <div class="box mt-2">
                 {% if form.is_saved is False %}
-                    {% include 'ui/partials/form_errors.html' with show_field_errors=True %}
+                    {% include 'ui/partials/form_errors.html' %}
                 {% endif %}
                 {% block form %}{% endblock %}
             </div>

accrete-0.0.59/accrete/contrib/ui/templates/ui/partials/form_errors.html

@@ -0,0 +1,34 @@
+<div class="columns py-0">
+    <div class="column is-12">
+        <div class="notification is-danger is-light">
+            <p>{{ form.non_field_errors }}</p>
+            {% for inline_form in form.inline_forms %}
+                <p>{{ inline_form.non_field_errors }}</p>
+            {% endfor %}
+            {% if form.save_error %}
+                <p>{{ form.save_error|safe }}</p>
+                <p>Error ID: {{ form.save_error_id }}</p>
+            {% endif %}
+            {% for f in form %}
+                {% if f.errors %}
+                    <label>
+                        <span class="is-underlined">{{ f.label_tag }}</span>
+                        <span class="is-size-7">{{ f.errors }}</span>
+                    </label>
+                {% endif %}
+            {% endfor %}
+            {% for formset in form.inline_forms %}
+                {% for inline_form in formset %}
+                    {% for field in inline_form %}
+                        {% if field.errors %}
+                            <label>
+                                <span class="is-underlined">{{ field.label_tag }}</span>
+                                <span class="is-size-7">{{ field.errors }}</span>
+                            </label>
+                        {% endif %}
+                    {% endfor %}
+                {% endfor %}
+            {% endfor %}
+        </div>
+    </div>
+</div>

accrete-0.0.59/accrete/contrib/ui/templates/ui/partials/modal_form.html

@@ -0,0 +1,33 @@
+{% load i18n %}
+
+<div id="modal-{{ form_id }}" class="modal {% block modal_form_class %}is-active{% endblock %}">
+    <div class="modal-background" onclick="removeModal('modal-{{ form_id }}')"></div>
+    <div class="modal-card">
+        <header class="modal-card-head">
+            <p class="modal-card-title">
+                {% block modal_title %}{% endblock %}
+            </p>
+            <button class="delete filter-modal-close" aria-label="close" onclick="removeModal('modal-{{ form_id }}')"></button>
+        </header>
+        <section id="modal-content" class="modal-card-body">
+            {% if form.is_saved is False %}
+                {% include 'ui/partials/form_errors.html' %}
+            {% endif %}
+            {% block modal_content %}{% endblock %}
+        </section>
+        <footer class="modal-card-foot">
+            {% block modal_footer %}
+                <div class="buttons" style="width: 100%">
+                    {% block modal_buttons %}
+                        <button class="button is-success" type="submit" form="{{ form_id }}">
+                            {% translate 'Save' %}
+                        </button>
+                        <button class="button" onclick="removeModal('modal-{{ form_id }}')">
+                            {% translate 'Discard' %}
+                        </button>
+                    {% endblock %}
+                </div>
+            {% endblock %}
+        </footer>
+    </div>
+</div>

{accrete-0.0.57 → accrete-0.0.59}/accrete/middleware.py

@@ -82,10 +82,12 @@ class HtmxRedirectMiddleware(MiddlewareMixin):
     @staticmethod
     def process_response(request, response):
         is_htmx = request.headers.get('HX-Request', 'false') == 'true'
-        is_redirect = isinstance(
-            response, (HttpResponseRedirect, HttpResponsePermanentRedirect)
-        )
-        if is_htmx and is_redirect:
-            response['HX-Redirect'] = response['Location']
+        if not is_htmx:
+            return response
+        is_redirect = isinstance(response, HttpResponseRedirect)
+        is_permanent_redirect = isinstance(response, HttpResponsePermanentRedirect)
+        if is_redirect or is_permanent_redirect:
             response.status_code = 200
+            header = 'HX-Location' if is_redirect else 'HX-Redirect'
+            response[header] = response['Location']
         return response

accrete-0.0.59/accrete/storage.py

@@ -0,0 +1,37 @@
+import os
+from urllib.parse import urljoin
+from django.core.files.storage import FileSystemStorage
+from django.utils.encoding import filepath_to_uri
+from django.utils.deconstruct import deconstructible
+from django.conf import settings
+from accrete.tenant import get_tenant
+
+
+@deconstructible(path="django.core.files.storage.FileSystemStorage")
+class TenantFileSystemStorage(FileSystemStorage):
+
+    @property
+    def base_location(self):
+        tenant = get_tenant()
+        base_dir = f'{settings.MEDIA_ROOT}/{tenant.id}'
+        os.makedirs(os.path.dirname(base_dir), exist_ok=True)
+        return base_dir
+
+    @property
+    def location(self):
+        return os.path.abspath(self.base_location)
+
+    @property
+    def base_url(self):
+        if self._base_url is not None and not self._base_url.endswith("/"):
+            self._base_url += "/"
+        res = self._value_or_setting(self._base_url, f'{settings.MEDIA_URL.strip("/")}/{get_tenant().id}')
+        return res
+
+    def url(self, name):
+        if self.base_url is None:
+            raise ValueError("This file is not accessible via a URL.")
+        url = filepath_to_uri(name)
+        if url is not None:
+            url = url.lstrip("/")
+        return urljoin(f'/{self.base_url}/', url)

{accrete-0.0.57 → accrete-0.0.59}/accrete/utils/forms.py

@@ -8,14 +8,14 @@ from django.forms import BaseFormSet
 _logger = logging.getLogger(__name__)
 
 
-def save_form(form, reraise=False):
+def save_form(form, commit=True, reraise=False):
     form.is_saved = False
     form.save_error = None
     form.save_error_id = None
     try:
         if form.is_valid():
             with transaction.atomic():
-                form.save()
+                form.save(commit=commit)
             form.is_saved = True
     except Exception as e:
         form.save_error = repr(e)
@@ -27,7 +27,7 @@ def save_form(form, reraise=False):
     return form
 
 
-def save_forms(form, inline_formsets: list = None, reraise: bool = False):
+def save_forms(form, inline_formsets: list = None, commit=True, reraise: bool = False):
 
     def handle_error(error):
         form.save_error = repr(error)
@@ -56,9 +56,9 @@ def save_forms(form, inline_formsets: list = None, reraise: bool = False):
 
     try:
         with transaction.atomic():
-            form.save()
+            form.save(commit=commit)
             for inline_formset in inline_formsets:
-                inline_formset.save()
+                inline_formset.save(commit=commit)
     except Exception as e:
         handle_error(e)
         if reraise:

{accrete-0.0.57 → accrete-0.0.59}/pyproject.toml

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

accrete-0.0.57/accrete/contrib/ui/templates/ui/partials/form_errors.html

@@ -1,36 +0,0 @@
-<div class="columns py-0">
-    <div class="column is-12">
-        <div class="notification is-danger is-light">
-            <p>{{ form.non_field_errors }}</p>
-            {% for inline_form in form.inline_forms %}
-                <p>{{ inline_form.non_field_errors }}</p>
-            {% endfor %}
-            {% if form.save_error %}
-                <p>{{ form.save_error|safe }}</p>
-                <p>Error ID: {{ form.save_error_id }}</p>
-            {% endif %}
-            {% if show_field_errors %}
-                {% for f in form %}
-                    {% if f.errors %}
-                        <label>
-                            <span class="is-underlined">{{ f.label_tag }}</span>
-                            <span class="is-size-7">{{ f.errors }}</span>
-                        </label>
-                    {% endif %}
-                {% endfor %}
-                {% for formset in form.inline_forms %}
-                    {% for inline_form in formset %}
-                        {% for field in inline_form %}
-                            {% if field.errors %}
-                                <label>
-                                    <span class="is-underlined">{{ field.label_tag }}</span>
-                                    <span class="is-size-7">{{ field.errors }}</span>
-                                </label>
-                            {% endif %}
-                        {% endfor %}
-                    {% endfor %}
-                {% endfor %}
-            {% endif %}
-        </div>
-    </div>
-</div>