From e542299f3dd1aea96c183d5d504e37a62235a052 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 29 Apr 2021 10:12:33 +0200
Subject: Fix basket sheet after pin of a basket

---
 .../templates/ishtar/blocks/window_tables/dynamic_documents.html  | 8 ++++----
 ishtar_common/views_item.py                                       | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'ishtar_common')

diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
index ff92b8af9..542866eb1 100644
--- a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
+++ b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
@@ -44,10 +44,10 @@
         <div class="btn-group btn-group-sm" role="group"
              aria-label="{% trans 'Export'%}">
             {% if source_full %}
-            <a class="btn btn-secondary" href='{{simple_source}}csv{{ source_attrs|safe }}' target='_blank' title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
-            <a class="btn btn-secondary" href='{{source_full}}csv{{ source_attrs|safe }}' target='_blank' title="{% trans 'Export as CSV - full' %}">{% trans "CSV full" %}</a>
+            <a class="btn btn-secondary" href='{{simple_source|safe}}csv{{ source_attrs|safe }}' target='_blank' title="{% trans 'Export as CSV' %}">{% trans "CSV" %}</a>
+            <a class="btn btn-secondary" href='{{source_full|safe}}csv{{ source_attrs|safe }}' target='_blank' title="{% trans 'Export as CSV - full' %}">{% trans "CSV full" %}</a>
             {% else %}
-            <a class="btn btn-secondary" href="{{simple_source}}csv{{ source_attrs|safe }}" target="_blank" title="{% trans 'Export as CSV' %}">CSV</a>
+            <a class="btn btn-secondary" href="{{simple_source|safe}}csv{{ source_attrs|safe }}" target="_blank" title="{% trans 'Export as CSV' %}">CSV</a>
             {% endif %}
         </div>
     </div>
@@ -62,7 +62,7 @@ setTimeout(
     function(){
       datatable_options = {
         "ajax": {
-            "url": "{{source}}",
+            "url": "{{source|safe}}",
             "dataSrc": "rows"
         },
         "columns": [
diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index daa6ece00..29d62182e 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -1687,7 +1687,6 @@ def get_item(
                 for __, jkey, jfield in json_fields:
                     if jfield.alt_name not in request_keys:
                         request_keys[jfield.alt_name] = jkey + "__iexact"
-
         if "query" in dct:
             request_items = dct["query"]
             request_items["submited"] = True
@@ -1729,7 +1728,7 @@ def get_item(
             base_query = my_base_request
             dct = {}
         else:
-            dct = my_base_request
+            dct = copy(my_base_request)
         excluded_dct = {}
         and_reqs, or_reqs = [], []
         exc_and_reqs, exc_or_reqs = [], []
-- 
cgit v1.2.3