From bb5b473898ff08b50dc8650ff35fecdd12fa912b Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Sat, 11 Feb 2023 14:54:57 +0000
Subject: [PATCH] Cache more templates

---
 .../mixins/partials/generic-detail.html       | 143 +++++++++---------
 .../mixins/window-content/object-form.html    |  62 ++++----
 .../mixins/window-content/object.html         |  85 ++++++-----
 .../mixins/window-content/objects.html        |   2 +-
 4 files changed, 150 insertions(+), 142 deletions(-)

diff --git a/mixins/templates/mixins/partials/generic-detail.html b/mixins/templates/mixins/partials/generic-detail.html
index b7dc105..3fd4f31 100644
--- a/mixins/templates/mixins/partials/generic-detail.html
+++ b/mixins/templates/mixins/partials/generic-detail.html
@@ -1,72 +1,77 @@
 {% load pretty %}
-{% include 'mixins/partials/notify.html' %}
 
-{% if live is not None %}
-  <h1 class="title">Live {{ context_object_name_singular }} info</h1>
-  <table class="table is-fullwidth is-hoverable">
-    <thead>
-      <th>attribute</th>
-      <th>value</th>
-    </thead>
-    <tbody>
-      {% block live_tbody %}
-        {% for key, item in live.items %}
-          {% if key in pretty %}
-            <tr>
-              <th>{{ key }}</th>
-              <td>
-                {% if item is not None %}
-                  <pre>{{ item|pretty }}</pre>
-                {% endif %}
-              </td>
-            </tr>
-          {% else %}
-            <tr>
-              <th>{{ key }}</th>
-              <td>
-                {% if item is not None %}
-                  {{ item }}
-                {% endif %}
-              </td>
-            </tr>
-          {% endif %}
-        {% endfor %}
-      {% endblock %}
-    </tbody>
-  </table>
-{% endif %}
+{% load cache %}
 
-{% if object is not None %}
-  <h1 class="title">{{ title_singular }} info</h1>
-  <table class="table is-fullwidth is-hoverable">
-    <thead>
-      <th>attribute</th>
-      <th>value</th>
-    </thead>
-    <tbody>
-      {% block tbody %}
-        {% for key, item in object.items %}
-          {% if key in pretty %}
-            <tr>
-              <th>{{ key }}</th>
-              <td>
-                {% if item is not None %}
-                  <pre>{{ item|pretty }}</pre>
-                {% endif %}
-              </td>
-            </tr>
-          {% else %}
-            <tr>
-              <th>{{ key }}</th>
-              <td>
-                {% if item is not None %}
-                  {{ item }}
-                {% endif %}
-              </td>
-            </tr>
-          {% endif %}
-        {% endfor %}
-      {% endblock %}
-    </tbody>
-  </table>
-{% endif %}
\ No newline at end of file
+{% cache 600 generic_detail request.user.id object live %}
+  {% include 'mixins/partials/notify.html' %}
+
+  {% if live is not None %}
+    <h1 class="title">Live {{ context_object_name_singular }} info</h1>
+    <table class="table is-fullwidth is-hoverable">
+      <thead>
+        <th>attribute</th>
+        <th>value</th>
+      </thead>
+      <tbody>
+        {% block live_tbody %}
+          {% for key, item in live.items %}
+            {% if key in pretty %}
+              <tr>
+                <th>{{ key }}</th>
+                <td>
+                  {% if item is not None %}
+                    <pre>{{ item|pretty }}</pre>
+                  {% endif %}
+                </td>
+              </tr>
+            {% else %}
+              <tr>
+                <th>{{ key }}</th>
+                <td>
+                  {% if item is not None %}
+                    {{ item }}
+                  {% endif %}
+                </td>
+              </tr>
+            {% endif %}
+          {% endfor %}
+        {% endblock %}
+      </tbody>
+    </table>
+  {% endif %}
+
+  {% if object is not None %}
+    <h1 class="title">{{ title_singular }} info</h1>
+    <table class="table is-fullwidth is-hoverable">
+      <thead>
+        <th>attribute</th>
+        <th>value</th>
+      </thead>
+      <tbody>
+        {% block tbody %}
+          {% for key, item in object.items %}
+            {% if key in pretty %}
+              <tr>
+                <th>{{ key }}</th>
+                <td>
+                  {% if item is not None %}
+                    <pre>{{ item|pretty }}</pre>
+                  {% endif %}
+                </td>
+              </tr>
+            {% else %}
+              <tr>
+                <th>{{ key }}</th>
+                <td>
+                  {% if item is not None %}
+                    {{ item }}
+                  {% endif %}
+                </td>
+              </tr>
+            {% endif %}
+          {% endfor %}
+        {% endblock %}
+      </tbody>
+    </table>
+  {% endif %}
+{% endcache %}
\ No newline at end of file
diff --git a/mixins/templates/mixins/window-content/object-form.html b/mixins/templates/mixins/window-content/object-form.html
index 0cf755e..e1e8006 100644
--- a/mixins/templates/mixins/window-content/object-form.html
+++ b/mixins/templates/mixins/window-content/object-form.html
@@ -1,34 +1,32 @@
-{% 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 %}
-{% load crispy_forms_tags %}
-
-{% load crispy_forms_bulma_field %}
-<form
-  hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-  hx-post="{{ submit_url }}"
-  hx-target="#modals-here"
-  hx-swap="innerHTML">
-  {% csrf_token %}
-  {{ form|crispy }}
-  {% if hide_cancel is not True %}
-    <button
-      type="button"
-      class="button is-light modal-close-button">
-      Cancel
-    </button>
-  {% endif %}
-  <button type="submit" class="button modal-close-button">Submit</button>
-</form>
-
-
-
-
-
-
+{% load cache %}
 
+{% cache 600 object_form request.user.id form %}
 
+  {% 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 %}
+  {% load crispy_forms_tags %}
+
+  {% load crispy_forms_bulma_field %}
+  <form
+    hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+    hx-post="{{ submit_url }}"
+    hx-target="#modals-here"
+    hx-swap="innerHTML">
+    {% csrf_token %}
+    {{ form|crispy }}
+    {% if hide_cancel is not True %}
+      <button
+        type="button"
+        class="button is-light modal-close-button">
+        Cancel
+      </button>
+    {% endif %}
+    <button type="submit" class="button modal-close-button">Submit</button>
+  </form>
+
+{% endcache %}
\ No newline at end of file
diff --git a/mixins/templates/mixins/window-content/object.html b/mixins/templates/mixins/window-content/object.html
index 343ae7c..c27de2e 100644
--- a/mixins/templates/mixins/window-content/object.html
+++ b/mixins/templates/mixins/window-content/object.html
@@ -1,45 +1,50 @@
-{% 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">
+{% load cache %}
 
-  {% 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>
-      </span>
-    </button>
+{% 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 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>
-    </button>
+  {% if page_subtitle is not None %}
+    <h1 class="subtitle">{{ page_subtitle }}</h1>
   {% endif %}
-</div>
+  <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>
+        </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>
+      </button>
+    {% endif %}
+  </div>
 
-{% include detail_template %}
+  {% include detail_template %}
 
+{% endcache %}
\ No newline at end of file
diff --git a/mixins/templates/mixins/window-content/objects.html b/mixins/templates/mixins/window-content/objects.html
index f5c7dc7..9092db6 100644
--- a/mixins/templates/mixins/window-content/objects.html
+++ b/mixins/templates/mixins/window-content/objects.html
@@ -1,6 +1,6 @@
 {% load cache %}
 
-{% cache 60 objects request.user.id object_list %}
+{% 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>