accrete 0.0.57__py3-none-any.whl → 0.0.59__py3-none-any.whl

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/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/contrib/ui/static/js/ui.js

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

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/contrib/ui/templates/ui/partials/form_errors.html

@@ -9,28 +9,26 @@
                 <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 %}
+            {% 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 %}
-            {% endif %}
+            {% endfor %}
         </div>
     </div>
 </div>

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/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/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/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.dist-info → accrete-0.0.59.dist-info}/METADATA

@@ -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.dist-info → accrete-0.0.59.dist-info}/RECORD

@@ -5,8 +5,9 @@ accrete/apps.py,sha256=F7ynMLHJr_6bRujWtZVUzCliY2CGKiDvyUmL4F68L2E,146
 accrete/config.py,sha256=eJUbvyBO3DvAD6xkVKjTAzlXy7V7EK9bVyb91girfUs,299
 accrete/forms.py,sha256=2vUh80qNvPDD8Zl3agKBSJEQeY7bXVLOx_SAB34wf8E,1359
 accrete/managers.py,sha256=CaIJLeBry4NYIXaVUrdUjp7zx4sEWgv-1-ssI1m-EOs,1156
-accrete/middleware.py,sha256=bUsvhdVdUlbqB-Hd5Y5w6WL8rO8It1VSGA5EZaEPA3o,3266
+accrete/middleware.py,sha256=IABs2pAV-kXjp3n5_Wsc7reXGjU5FhmCbvFB8cC4ZRM,3422
 accrete/models.py,sha256=grvRNXg0ZYAJU3KAIX-svuZXeXlfqP4qEJ00nlbV594,5145
+accrete/storage.py,sha256=z7pHdQFw0hFGrrbfqIh7KFxabQ_JGqoPebmiX9TLmeU,1254
 accrete/tenant.py,sha256=g3ZuTrQr2zqmIopNBRQeCmHEK2R3dlUme_hOV765J6U,1778
 accrete/tests.py,sha256=Agltbzwwh5htvq_Qi9vqvxutzmg_GwgPS_N19xJZRlw,7197
 accrete/views.py,sha256=9-sgCFe_CyG-wllAcIOLujyueiq66C-zg0U7Uf5Y2wU,2954
@@ -35,9 +36,9 @@ accrete/contrib/system_mail/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JC
 accrete/contrib/ui/__init__.py,sha256=aeRSerct2JWpztNoxWDZXi7FzJhfxptVMVAZl4Sdzqs,504
 accrete/contrib/ui/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 accrete/contrib/ui/apps.py,sha256=E0ao2ox6PQ3ldfeR17FXJUUJuGiWjm2DPCxHbPXGzls,152
-accrete/contrib/ui/context.py,sha256=jVD7w9QIIA2qh04UrO9rYDDrY-0Osr6FLggMlGxvztI,8364
+accrete/contrib/ui/context.py,sha256=tb4x_G4VsIa1LKIWl-CvLVtEd_DCbrClA-0Wmnne9bc,8363
 accrete/contrib/ui/elements.py,sha256=0F5q0-XLdAWQjdYLMQt6RXqz4xPD_ECrhs0kcBfYkvo,1856
-accrete/contrib/ui/filter.py,sha256=L7sBpmk454kaSZIQXe9hNj1Xbna8hJ2P-YTvmM7T5FE,12243
+accrete/contrib/ui/filter.py,sha256=UAIkUNKu2nVQLafwZlkQu4PDfOPyFM61e_mE7OWRhYs,12410
 accrete/contrib/ui/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 accrete/contrib/ui/urls.py,sha256=TUBlz_CGs9InTZoxM78GSnucA73I8knoh_obt12RUHM,186
 accrete/contrib/ui/views.py,sha256=WpBKMsxFFG8eG4IN7TW_TPE6i3OFF7gnLDTK7JMKti8,191
@@ -144,7 +145,7 @@ accrete/contrib/ui/static/icons/Logo.svg,sha256=hGZuxrAa-LRpFavFiF8Lnc7X9OQcqmb6
 accrete/contrib/ui/static/icons/accrete.svg,sha256=CWHJKIgk3hxL7xIaFSz2j1cK-eF1TroCbjcF58bgOIs,1024
 accrete/contrib/ui/static/js/filter.js,sha256=-8yGsI4juzA9ZkUS4Qrto4s5Wq4teRLyZfJm5dySm7o,24613
 accrete/contrib/ui/static/js/htmx.min.js,sha256=s73PXHQYl6U2SLEgf_8EaaDWGQFCm6H26I-Y69hOZp4,47755
-accrete/contrib/ui/static/js/ui.js,sha256=pJm5Wc2bg9Bu0PWafz1cHpGrM5so4U11MkCKdstxUms,1015
+accrete/contrib/ui/static/js/ui.js,sha256=VO2kcfav1aTuqlz4YJl2sZkPD-vsm259yQb12GrNMxo,1096
 accrete/contrib/ui/static/webfonts/fa-brands-400.ttf,sha256=VlbVlrxZcWWkIYL2eyufF9KuR6nj7xsEK5pylzlzBwU,207972
 accrete/contrib/ui/static/webfonts/fa-brands-400.woff2,sha256=OokkzVIDooYocWrttc7wlD2kw7ROP_zukKsGOHtBxJA,117372
 accrete/contrib/ui/static/webfonts/fa-regular-400.ttf,sha256=XQLcm4WOPIWnlPh-N5hX9P7cTibPFQAXFKmg4LHSKU0,68004
@@ -162,14 +163,15 @@ 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/dashboard.html,sha256=udnwiSJEcn2wMaJfTs4P0Y20FU79VguK_9Lq4K2BqtM,160
 accrete/contrib/ui/templates/ui/detail.html,sha256=b1HC1QCGooo6tLh7fLhEDPau1tIOzscLXP6R_PN758I,1093
-accrete/contrib/ui/templates/ui/form.html,sha256=cd6VUNzfIZH2_iudQa_EkqsPaBjyTam4Fm-Kgh8YpkY,655
+accrete/contrib/ui/templates/ui/form.html,sha256=mlrMsxUOn5RkyROLYBHWzdWckN8Cg-2-ynD0SRmuXSM,627
 accrete/contrib/ui/templates/ui/layout.html,sha256=f8K0KDlh_eDz0UKH0IB34dBjPtDiNgsuPgysK-DYLgE,14792
 accrete/contrib/ui/templates/ui/list.html,sha256=6jmChhCpj6iuSqAG7X_eD5ZjVvwU4cyynmvoH0-juTk,1740
 accrete/contrib/ui/templates/ui/table.html,sha256=bdPN2F7e7i3FHcQ18e0HJKkYT64PpxPRALRjcirJKGQ,4243
 accrete/contrib/ui/templates/ui/partials/filter.html,sha256=2vmeL3980rMmkRnmVtZh9mBHe6S0PTMjaGIN1J6SpNM,7184
-accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=QjfRriD9Z5SlhIFX__nVXqB3rPg4icbG4G02kML8IcQ,1529
+accrete/contrib/ui/templates/ui/partials/form_errors.html,sha256=C5ktasYff2xBTiWfM6QR8qaGKSyK9QufB3B9N77KGpg,1386
 accrete/contrib/ui/templates/ui/partials/form_modal.html,sha256=E52tFaIL3mcWRBHEamkOL1ZSBsBv08JsYFkoUtlhGgc,1165
 accrete/contrib/ui/templates/ui/partials/header.html,sha256=5ER9E6c-vwDxuIuMSXL4F_fq2zYY17R_0A0Ao--H4Us,6916
+accrete/contrib/ui/templates/ui/partials/modal_form.html,sha256=wEcpi-WRz20R61gE-qtzZJIrXixjwvaJXX6FsVQrCRE,1451
 accrete/contrib/ui/templates/ui/partials/onchange_form.html,sha256=K5twTGqRUW1iM2dGtdWntjsJvJVo5EIzKxX2HK-H1yw,160
 accrete/contrib/ui/templates/ui/partials/pagination_detail.html,sha256=58nA3X7Il0FAD4VcYyr7tTGWRiVf_FN1TkImmKEpKHU,1014
 accrete/contrib/ui/templates/ui/partials/pagination_list.html,sha256=Eyx1lsk9UIFFYPICL7RuYeUFaKVlmvWVXnFCGR-II7k,1324
@@ -216,10 +218,10 @@ accrete/migrations/0002_initial.py,sha256=dFOM7kdHlx7pVAh8cTDlZMtciN4O9Z547HAzEK
 accrete/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 accrete/utils/__init__.py,sha256=YwEzwjz-E92LHhqeLsQ4167zXHHY1PFG6xcsAofnmBU,192
 accrete/utils/dates.py,sha256=apM6kt6JhGrKgoT0jfav1W-8AUVTxNc9xt3fJQ2n0JI,1492
-accrete/utils/forms.py,sha256=UP6vCCTtXD5MqU2LWbNXtk2ZMMEmoty_tjLCbJlqYsY,2984
+accrete/utils/forms.py,sha256=Lll-DvAhKZDw72XeuCtb4wxQEJNFp7lQWh_Z1GyH3Zk,3049
 accrete/utils/http.py,sha256=mAtQRgADv7zu1_j7A-EKVyb-oqa5a21i4Gd0QfjzGV0,3540
 accrete/utils/models.py,sha256=EEhv7-sQVtQD24PEb3XcDUAh3VVhVFoMMLyFrDjGEaI,706
-accrete-0.0.57.dist-info/METADATA,sha256=tiRCQAdfWu09ATxMwWIf-lKa09FNZ31qCoicK9-kfi4,4892
-accrete-0.0.57.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-accrete-0.0.57.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
-accrete-0.0.57.dist-info/RECORD,,
+accrete-0.0.59.dist-info/METADATA,sha256=na4Zyia9GVHueWMmrOaC1E1sbJmsfLGkEaPVlVzzuzo,4892
+accrete-0.0.59.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+accrete-0.0.59.dist-info/licenses/LICENSE,sha256=_7laeMIHnsd3Y2vJEXDYXq_PEXxIcjgJsGt8UIKTRWc,1057
+accrete-0.0.59.dist-info/RECORD,,