diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2026-06-24 18:20:41 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2026-06-24 18:20:41 +0200 |
| commit | 017f8f2b332910b741e89da9f75b5f739a69afe8 (patch) | |
| tree | 284365b58f5b3054e72442fb149be3632da21d8a /ishtar_common | |
| parent | 97b36ab6a4cfad09f5d545fad4f7629260eedb49 (diff) | |
| download | Ishtar-017f8f2b332910b741e89da9f75b5f739a69afe8.tar.bz2 Ishtar-017f8f2b332910b741e89da9f75b5f739a69afe8.zip | |
✨ statement condition: delete view and logic (manage first and last item)develop-5.0
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/templates/ishtar/forms/error.html | 9 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/forms/success.html | 2 | ||||
| -rw-r--r-- | ishtar_common/urls.py | 5 | ||||
| -rw-r--r-- | ishtar_common/views.py | 4 |
4 files changed, 20 insertions, 0 deletions
diff --git a/ishtar_common/templates/ishtar/forms/error.html b/ishtar_common/templates/ishtar/forms/error.html new file mode 100644 index 000000000..7bedbabf2 --- /dev/null +++ b/ishtar_common/templates/ishtar/forms/error.html @@ -0,0 +1,9 @@ +{% extends "ishtar/forms/success.html" %} +{% load i18n inline_formset table_form %} +{% block main_content %} +{% if message %} +{{ message }} +{% else %} +{% trans "An error has been encountered. It may be necessary to refresh the table/sheet." %} +{% endif %} +{% endblock %} diff --git a/ishtar_common/templates/ishtar/forms/success.html b/ishtar_common/templates/ishtar/forms/success.html index a3885a813..21bd27dcb 100644 --- a/ishtar_common/templates/ishtar/forms/success.html +++ b/ishtar_common/templates/ishtar/forms/success.html @@ -29,11 +29,13 @@ $(document).ready(function(){ </button> </div> <div class="modal-body form-row"> + {% block main_content %} {% if message %} {{ message }} {% else %} {% trans "Changes made successfully. It may be necessary to refresh the table/sheet." %} {% endif %} + {% endblock %} </div> </div> </div> diff --git a/ishtar_common/urls.py b/ishtar_common/urls.py index 827e85a7a..201e4fdbc 100644 --- a/ishtar_common/urls.py +++ b/ishtar_common/urls.py @@ -414,6 +414,11 @@ urlpatterns = [ views.SuccessView.as_view(), name="success", ), + re_path( + r"^error(?:/(?P<context>[a-z-]+)(?:/(?P<arg>[0-9a-z-|]+))?)?/$", + views.ErrorView.as_view(), + name="error", + ), ] menu = Menu(None) diff --git a/ishtar_common/views.py b/ishtar_common/views.py index dbaf8626b..03ab3f3f4 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -3258,6 +3258,10 @@ class SuccessView(TemplateView): return data +class ErrorView(SuccessView): + template_name = "ishtar/forms/error.html" + + class BookmarkList( SearchQueryMixin, JSONResponseMixin, LoginRequiredMixin, TemplateView ): |
