From 435797a54e4d322a46711f303c2fc1fd5286330e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 10 Oct 2024 13:42:18 +0200 Subject: ✨ site and operation relations forms refactoring MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/static/js/ishtar.js | 21 ++++++++++++++++ .../templates/blocks/bs_alert_message.html | 4 +++ .../templates/ishtar/blocks/window_nav.html | 4 ++- .../templates/ishtar/forms/modify_relations.html | 9 ++++++- ishtar_common/templatetags/ishtar_helpers.py | 2 +- ishtar_common/templatetags/window_header.py | 7 ++++-- ishtar_common/urls_converters.py | 29 ++++++++++++++++++++++ 7 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 ishtar_common/templates/blocks/bs_alert_message.html create mode 100644 ishtar_common/urls_converters.py (limited to 'ishtar_common') diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js index 2bcfe5a7e..1ef2e4c1d 100644 --- a/ishtar_common/static/js/ishtar.js +++ b/ishtar_common/static/js/ishtar.js @@ -454,8 +454,29 @@ $(document).ready(function(){ $("[aria-controls='" + $(this).attr("id") + "']").click(); } }); + register_modal_on_close(); }); + +var modal_on_close = new Array(); + +var register_modal_on_close = function(){ + $(".modal").each( + function(){ + if (this.id) { + modal_on_close[this.id] = undefined; + $("#" + this.id).on('hide.bs.modal', function() { + if (modal_on_close[this.id] !== undefined){ + modal_on_close[this.id](); + // reinitialize after call + modal_on_close[this.id] = undefined; + } + }); + } + } + ); +} + var register_wait_button = function(){ $(".wait-button").click(function(){short_wait()}); }; diff --git a/ishtar_common/templates/blocks/bs_alert_message.html b/ishtar_common/templates/blocks/bs_alert_message.html new file mode 100644 index 000000000..b0b5241a7 --- /dev/null +++ b/ishtar_common/templates/blocks/bs_alert_message.html @@ -0,0 +1,4 @@ + diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html index e3ed13f97..63aafb93a 100644 --- a/ishtar_common/templates/ishtar/blocks/window_nav.html +++ b/ishtar_common/templates/ishtar/blocks/window_nav.html @@ -2,6 +2,8 @@ {% else %}

{{item.current_source}}

-{% endif %} \ No newline at end of file +{% endif %} diff --git a/ishtar_common/templates/ishtar/forms/modify_relations.html b/ishtar_common/templates/ishtar/forms/modify_relations.html index 1dcf02b0c..419d94c9a 100644 --- a/ishtar_common/templates/ishtar/forms/modify_relations.html +++ b/ishtar_common/templates/ishtar/forms/modify_relations.html @@ -12,6 +12,10 @@ {{ formset.management_form }} {% csrf_token %}
+ {% if excess %} + {% with alert_message=excess %} + {% include "blocks/bs_alert_message.html" %} + {% endwith %}{% endif %}
{% block main_form %} @@ -52,7 +56,10 @@ qa_action_register("{{url}}"); $(document).on("click", '.check-all-relations', function(){ $('input[id$="-DELETE"]:checkbox').prop('checked', $(this).is(':checked')); - }); + });{% if window_id %} + console.log("{{window_id}}"); + modal_on_close["modal-dynamic-form"] = reload_window_{{window_id}}; + {% endif %} {% block js_ready %} {% endblock %} }); diff --git a/ishtar_common/templatetags/ishtar_helpers.py b/ishtar_common/templatetags/ishtar_helpers.py index 8c8227312..329f82dde 100644 --- a/ishtar_common/templatetags/ishtar_helpers.py +++ b/ishtar_common/templatetags/ishtar_helpers.py @@ -107,4 +107,4 @@ def can_edit_item(item, context): @register.filter def format_date(value): - return python_format_date(value) \ No newline at end of file + return python_format_date(value) diff --git a/ishtar_common/templatetags/window_header.py b/ishtar_common/templatetags/window_header.py index c36cbc465..bfcd95883 100644 --- a/ishtar_common/templatetags/window_header.py +++ b/ishtar_common/templatetags/window_header.py @@ -18,8 +18,11 @@ def window_nav(context, item, window_id, show_url, modify_url='', histo_url='', revert_url='', previous=None, nxt=None, pin_action=False): extra_actions = [] if hasattr(item, 'get_extra_actions'): - extra_actions = sorted_actions( - item.get_extra_actions(context['request'])) + try: + extra_actions = item.get_extra_actions(context['request'], context["window_id_underscore"]) + except (KeyError, TypeError): + extra_actions = item.get_extra_actions(context['request']) + extra_actions = sorted_actions(extra_actions) extra_templates = [] if hasattr(item, 'get_extra_templates'): extra_templates = item.get_extra_templates(context['request']) diff --git a/ishtar_common/urls_converters.py b/ishtar_common/urls_converters.py new file mode 100644 index 000000000..9395af648 --- /dev/null +++ b/ishtar_common/urls_converters.py @@ -0,0 +1,29 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +# Copyright (C) 2024 Étienne Loks + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. + +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +# See the file COPYING for details. + + +class UnderscoreSlug: + regex = '[_0-9a-z]+' + + def to_python(self, value): + return str(value) + + def to_url(self, value): + return str(value) + -- cgit v1.2.3