From 0561aa54f4d1529f9291766cfc118a0aa2794aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20M=C3=BCnch?= <moritzmuench@mailbox.org>
Date: Mon, 4 Oct 2021 10:57:24 +0000
Subject: [PATCH] cleanup, version and settings bump

---
 coinmanager/coinc/templates/coinc/index.html  | 22 ++++++++--------
 coinmanager/coinc/templates/footer.html       |  2 +-
 .../coinmanager/production_settings.py        | 25 +++++++++++--------
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/coinmanager/coinc/templates/coinc/index.html b/coinmanager/coinc/templates/coinc/index.html
index b79e966..6655410 100644
--- a/coinmanager/coinc/templates/coinc/index.html
+++ b/coinmanager/coinc/templates/coinc/index.html
@@ -1,14 +1,16 @@
 {% include 'header.html' with title='Münzsammlung' %}
-    {% if countrys %}
-      <p><h5>Gesamtwert {{ coin_sum }}</h5></p>
-      {% include 'coinc/filter_country.html' with countrys=countrys %}
-      <p><h5>Zuletzt gefunden</h5></p>
-      {% for coin in recent_coins %}
-      {% if coin.exists %}
-      <p>{{ coin.found_on|date:"d.m.Y" }}: {{ coin.value|floatformat:2 }} &euro; {{ coin.year }}{% if coin.stamp %}-{{ coin.stamp }}{% endif %}{% if coin.name %} "{{ coin.name }}"{% endif %} aus {{ coin.country}} von {{ coin.found_by }}</p>
+{% if countrys %}
+    <h5>Gesamtwert {{ coin_sum }}</h5>
+  {% include 'coinc/filter_country.html' with countrys=countrys %}
+    <h5>Zuletzt gefunden</h5>
+  {% for coin in recent_coins %}
+    {% if coin.exists %}
+      {% if coin.found_by %}
+    <p>{{ coin.found_on|date:"d.m.Y" }}: {{ coin.value|floatformat:2 }} &euro; {{ coin.year }}{% if coin.stamp %}-{{ coin.stamp }}{% endif %}{% if coin.name %} "{{ coin.name }}"{% endif %} aus {{ coin.country}} von {{ coin.found_by }}</p>
       {% endif %}
-      {% endfor %}
-    {% else %}
-      <p>Trage zuerst Länder im Adminbereich ein.</p>
     {% endif %}
+  {% endfor %}
+{% else %}
+    <p>Trage zuerst Länder im Adminbereich ein.</p>
+{% endif %}
 {% include 'footer.html' %}
diff --git a/coinmanager/coinc/templates/footer.html b/coinmanager/coinc/templates/footer.html
index ff9bee1..3cc4b47 100644
--- a/coinmanager/coinc/templates/footer.html
+++ b/coinmanager/coinc/templates/footer.html
@@ -1,3 +1,3 @@
-    <span class="badge badge-pill badge-light">Version 210712</span>
+    <span class="badge badge-pill badge-light">Version 211004</span>
   </body>
 </html>
diff --git a/coinmanager/coinmanager/production_settings.py b/coinmanager/coinmanager/production_settings.py
index be88c2a..2f2acdf 100644
--- a/coinmanager/coinmanager/production_settings.py
+++ b/coinmanager/coinmanager/production_settings.py
@@ -32,7 +32,7 @@ ALLOWED_HOSTS = ['willipink.eu']
 
 INSTALLED_APPS = [
     'coinc.apps.CoincConfig',
-    'cacheops',
+#     'cacheops',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -135,22 +135,27 @@ MAINTENANCE_MODE_READ_ONLY = False
 LOGIN_REDIRECT_URL = './'
 
 # caching
-CACHES = {
-    'default': {
+# CACHES = {
+#     'default': {
         # file-based
-        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
-        'LOCATION': '/var/tmp/django-cache',
-        'TIMEOUT': None,
+#         'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+#         'LOCATION': '/var/tmp/django-cache',
+#         'TIMEOUT': None,
         # memory-based
         #'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
         #'LOCATION': 'coinc',
         #'TIMEOUT': None,
-    }
-}
+#     }
+# }
 
 # caching
 # CACHE_MIDDLEWARE_ALIAS = 'default'
 # CACHE_MIDDLEWARE_SECONDS = 60*60*24*365
 
-CACHEOPS_REDIS = "unix://var/run/redis/redis-server.sock"
-CACHEOPS_DEGRADE_ON_FAILURE = True
+# CACHEOPS_REDIS = "unix://var/run/redis/redis-server.sock"
+# CACHEOPS_DEFAULTS = { 'timeout': 60*60*24*365 }
+# CACHEOPS = {
+# #     'coinc.*': None,
+#     'coinc.coin': { 'cache_on_save': True }
+# }
+# CACHEOPS_DEGRADE_ON_FAILURE = True