From 3d7c3504aa02dff3536ce11b8abd91b2f0b70ebe Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Sat, 11 Feb 2023 17:59:31 +0000
Subject: [PATCH] Remove caching from common object templates

---
 .../mixins/window-content/object.html         | 86 +++++++++----------
 .../mixins/window-content/objects.html        | 85 +++++++++---------
 2 files changed, 80 insertions(+), 91 deletions(-)

diff --git a/mixins/templates/mixins/window-content/object.html b/mixins/templates/mixins/window-content/object.html
index c27de2e..06eedc4 100644
--- a/mixins/templates/mixins/window-content/object.html
+++ b/mixins/templates/mixins/window-content/object.html
@@ -1,50 +1,44 @@
-{% load cache %}
+{% include 'mixins/partials/notify.html' %}
+{% if page_title is not None %}
+  <h1 class="title is-4">{{ page_title }}</h1>
+{% endif %}
+{% if page_subtitle is not None %}
+  <h1 class="subtitle">{{ page_subtitle }}</h1>
+{% endif %}
+<div class="buttons">
 
-{% cache 600 object request.user.id object %}
-
-  {% include 'mixins/partials/notify.html' %}
-  {% if page_title is not None %}
-    <h1 class="title is-4">{{ page_title }}</h1>
-  {% endif %}
-  {% if page_subtitle is not None %}
-    <h1 class="subtitle">{{ page_subtitle }}</h1>
-  {% endif %}
-  <div class="buttons">
-
-    {% if submit_url is not None %}
-      <button
-        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-        hx-get="{{ submit_url }}"
-        hx-trigger="click"
-        hx-target="#modals-here"
-        class="button">
-        <span class="icon-text">
-          <span class="icon">
-            <i class="fa-solid fa-plus"></i>
-          </span>
-          <span>{{ title_singular }}</span>
+  {% if submit_url is not None %}
+    <button
+      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+      hx-get="{{ submit_url }}"
+      hx-trigger="click"
+      hx-target="#modals-here"
+      class="button">
+      <span class="icon-text">
+        <span class="icon">
+          <i class="fa-solid fa-plus"></i>
         </span>
-      </button>
-    {% endif %}
-    {% if delete_all_url is not None %}
-      <button
-        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-        hx-delete="{{ delete_all_url }}"
-        hx-trigger="click"
-        hx-target="#modals-here"
-        hx-swap="innerHTML"
-        hx-confirm="Are you sure you wish to delete all {{ context_object_name }}?"
-        class="button">
-        <span class="icon-text">
-          <span class="icon">
-            <i class="fa-solid fa-xmark"></i>
-          </span>
-          <span>Delete all {{ context_object_name }} </span>
+        <span>{{ title_singular }}</span>
+      </span>
+    </button>
+  {% endif %}
+  {% if delete_all_url is not None %}
+    <button
+      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+      hx-delete="{{ delete_all_url }}"
+      hx-trigger="click"
+      hx-target="#modals-here"
+      hx-swap="innerHTML"
+      hx-confirm="Are you sure you wish to delete all {{ context_object_name }}?"
+      class="button">
+      <span class="icon-text">
+        <span class="icon">
+          <i class="fa-solid fa-xmark"></i>
         </span>
-      </button>
-    {% endif %}
-  </div>
-
-  {% include detail_template %}
+        <span>Delete all {{ context_object_name }} </span>
+      </span>
+    </button>
+  {% endif %}
+</div>
 
-{% endcache %}
\ No newline at end of file
+{% include detail_template %}
diff --git a/mixins/templates/mixins/window-content/objects.html b/mixins/templates/mixins/window-content/objects.html
index 9092db6..5313ec4 100644
--- a/mixins/templates/mixins/window-content/objects.html
+++ b/mixins/templates/mixins/window-content/objects.html
@@ -1,49 +1,44 @@
-{% load cache %}
+{% include 'mixins/partials/notify.html' %}
+{% if page_title is not None %}
+  <h1 class="title is-4">{{ page_title }}</h1>
+{% endif %}
+{% if page_subtitle is not None %}
+  <h1 class="subtitle">{{ page_subtitle }}</h1>
+{% endif %}
+<div class="buttons">
 
-{% cache 600 objects request.user.id object_list %}
-  {% include 'mixins/partials/notify.html' %}
-  {% if page_title is not None %}
-    <h1 class="title is-4">{{ page_title }}</h1>
-  {% endif %}
-  {% if page_subtitle is not None %}
-    <h1 class="subtitle">{{ page_subtitle }}</h1>
-  {% endif %}
-  <div class="buttons">
-
-    {% if submit_url is not None %}
-      <button
-        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-        hx-get="{{ submit_url }}"
-        hx-trigger="click"
-        hx-target="#modals-here"
-        class="button">
-        <span class="icon-text">
-          <span class="icon">
-            <i class="fa-solid fa-plus"></i>
-          </span>
-          <span>{{ title_singular }}</span>
+  {% if submit_url is not None %}
+    <button
+      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+      hx-get="{{ submit_url }}"
+      hx-trigger="click"
+      hx-target="#modals-here"
+      class="button">
+      <span class="icon-text">
+        <span class="icon">
+          <i class="fa-solid fa-plus"></i>
         </span>
-      </button>
-    {% endif %}
-    {% if delete_all_url is not None %}
-      <button
-        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-        hx-delete="{{ delete_all_url }}"
-        hx-trigger="click"
-        hx-target="#modals-here"
-        hx-swap="innerHTML"
-        hx-confirm="Are you sure you wish to delete all {{ context_object_name }}?"
-        class="button">
-        <span class="icon-text">
-          <span class="icon">
-            <i class="fa-solid fa-xmark"></i>
-          </span>
-          <span>Delete all {{ context_object_name }} </span>
+        <span>{{ title_singular }}</span>
+      </span>
+    </button>
+  {% endif %}
+  {% if delete_all_url is not None %}
+    <button
+      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+      hx-delete="{{ delete_all_url }}"
+      hx-trigger="click"
+      hx-target="#modals-here"
+      hx-swap="innerHTML"
+      hx-confirm="Are you sure you wish to delete all {{ context_object_name }}?"
+      class="button">
+      <span class="icon-text">
+        <span class="icon">
+          <i class="fa-solid fa-xmark"></i>
         </span>
-      </button>
-    {% endif %}
-  </div>
-
-  {% include list_template %}
+        <span>Delete all {{ context_object_name }} </span>
+      </span>
+    </button>
+  {% endif %}
+</div>
 
-{% endcache %}
\ No newline at end of file
+{% include list_template %}