diff options
Diffstat (limited to 'ishtar_common/templates/ishtar')
| -rw-r--r-- | ishtar_common/templates/ishtar/blocks/window_nav.html | 4 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/forms/modify_relations.html | 9 |
2 files changed, 11 insertions, 2 deletions
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 @@ <script type="text/javascript">{% localize off %} var current_url_{{window_id_underscore}}; var reload_window_{{window_id_underscore}} = function() { + /* reload put the sheet at the end of list - force other to be close in order to not loose the current sheet */ + $(".sheet > .collapse").removeClass("show"); load_window(current_url_{{window_id_underscore}}, '', function(){hide_window("{{window_id}}");}, true); @@ -126,4 +128,4 @@ $(document).ready(function(){ </script> {% else %} <h3 class="external-source"><i class="fa fa-globe" aria-hidden="true"></i> {{item.current_source}}</h3> -{% 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 %} <div class="modal-body body-scroll"> + {% if excess %} + {% with alert_message=excess %} + {% include "blocks/bs_alert_message.html" %} + {% endwith %}{% endif %} <div class='form'> {% block main_form %} <table class='w-100 inline-table text-center'> @@ -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 %} }); |