From 8e51c52e8b0de311e6a8f108c792d70856b87b06 Mon Sep 17 00:00:00 2001
From: Michael Krause <krause@mpib-berlin.mpg.de>
Date: Tue, 23 Nov 2021 20:59:50 +0100
Subject: [PATCH] Fix device list link when main department is set

---
 templates/snippets/widgets/bookmarks.html        | 6 ++----
 templates/snippets/widgets/newestdevices.html    | 6 ++----
 templates/snippets/widgets/overdue.html          | 6 ++----
 templates/snippets/widgets/returnsoon.html       | 6 ++----
 templates/snippets/widgets/shorttermdevices.html | 6 ++----
 5 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/templates/snippets/widgets/bookmarks.html b/templates/snippets/widgets/bookmarks.html
index 59909087..a438b709 100644
--- a/templates/snippets/widgets/bookmarks.html
+++ b/templates/snippets/widgets/bookmarks.html
@@ -24,8 +24,6 @@
     </table>
 
     <div class="card-footer text-right">
-        {% with dep=user.main_department|default:"all" %}
-            <a href="{% url 'device-list' %}?department={{ dep|iriencode }}&filter=bookmark&sorting=name">{% trans "More…" %}</a>
-        {% endwith %}
+        <a href="{% url 'device-list' %}?filter=bookmark&sorting=name">{% trans "More…" %}</a>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/snippets/widgets/newestdevices.html b/templates/snippets/widgets/newestdevices.html
index 0cbbab6c..d4eaaffb 100644
--- a/templates/snippets/widgets/newestdevices.html
+++ b/templates/snippets/widgets/newestdevices.html
@@ -27,8 +27,6 @@
         </tbody>
     </table>
     <div class="card-footer text-right">
-        {% with dep=user.main_department|default:"all" %}
-            <a href="{% url 'device-list' %}?department={{ dep|iriencode }}&filter=active&sorting=-created_at">{% trans "More…" %}</a>
-        {% endwith %}
+        <a href="{% url 'device-list' %}?filter=active&sorting=-created_at">{% trans "More…" %}</a>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/snippets/widgets/overdue.html b/templates/snippets/widgets/overdue.html
index 1fe35510..fe113e6d 100644
--- a/templates/snippets/widgets/overdue.html
+++ b/templates/snippets/widgets/overdue.html
@@ -40,8 +40,6 @@
         </tbody>
     </table>
     <div class="card-footer text-right">
-        {%  with dep=user.main_department|default:"all" %}
-            <a href="{% url 'device-list' %}?department={{ dep|iriencode }}&filter=overdue&sorting=name">{% trans "More…" %}</a>
-        {% endwith %}
+        <a href="{% url 'device-list' %}?filter=overdue&sorting=name">{% trans "More…" %}</a>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/snippets/widgets/returnsoon.html b/templates/snippets/widgets/returnsoon.html
index 1eabc118..d34886e1 100644
--- a/templates/snippets/widgets/returnsoon.html
+++ b/templates/snippets/widgets/returnsoon.html
@@ -37,8 +37,6 @@
         </tbody>
     </table>
     <div class="card-footer text-right">
-        {% with dep=user.main_department|default:"all" %}
-            <a href="{% url 'device-list' %}?department={{ dep|iriencode }}&filter=returnsoon&sorting=name">{% trans "More…" %}</a>
-        {% endwith %}
+        <a href="{% url 'device-list' %}?filter=returnsoon&sorting=name">{% trans "More…" %}</a>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/snippets/widgets/shorttermdevices.html b/templates/snippets/widgets/shorttermdevices.html
index 8de61d88..d1e6a3ec 100644
--- a/templates/snippets/widgets/shorttermdevices.html
+++ b/templates/snippets/widgets/shorttermdevices.html
@@ -31,8 +31,6 @@
         </tbody>
     </table>
     <div class="card-footer text-right">
-        {% with dep=user.main_department|default:"all" %}
-            <a href="{% url 'device-list' %}?department={{ dep|iriencode }}&filter=temporary&sorting=name">{% trans "More…" %}</a>
-        {% endwith %}
+        <a href="{% url 'device-list' %}?filter=temporary&sorting=name">{% trans "More…" %}</a>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}