From 4aa7b7151acb65266a7b3dc355e7c4ad9d464882 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 10 May 2017 10:11:57 +0200
Subject: [PATCH] messages working

---
 .gitignore                     |  2 ++
 rowers/tpstuff.py              |  6 +++---
 rowers/views.py                |  1 +
 rowsandall_app/settings.py     | 12 ++++++++++++
 rowsandall_app/settings_dev.py |  6 ++++++
 templates/basebase.html        | 13 ++++++++++++-
 6 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3c4022c7..c0ebdb5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+# cache
+/django_cache/
 
 # Compiled python modules.
 *.pyc
diff --git a/rowers/tpstuff.py b/rowers/tpstuff.py
index 520d302f..32ed72c9 100644
--- a/rowers/tpstuff.py
+++ b/rowers/tpstuff.py
@@ -27,7 +27,7 @@ from django.conf import settings
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required
-from django.contrib import messages
+#from django.contrib import messages
 
 # Project
 # from .models import Profile
@@ -46,7 +46,7 @@ tpapilocation = "https://api.trainingpeaks.com"
 
 from celery import Celery,app
 import time
-from async_messages import message_user
+from async_messages import message_user,messages
 
 @app.task
 def addcomment(userid,id):
@@ -55,7 +55,7 @@ def addcomment(userid,id):
     w.notes += '\n the task has run'
     w.save()
     u = User.objects.get(id=userid)
-    message_user(u,' The task has run')
+    messages.info(u,' The task has run')
     return 1
 
 
diff --git a/rowers/views.py b/rowers/views.py
index 2498bd1c..c97df405 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -2183,6 +2183,7 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
                   })
 
 from rowers.tpstuff import addcomment
+from django.contrib import messages
 # Test asynchronous tasking and messaging
 @login_required()
 def workout_test_task_view(request,id=0):
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index 3d9caec5..6a8a7d4e 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -70,6 +70,8 @@ AUTHENTICATION_BACKENDS = (
 )
 
 MIDDLEWARE_CLASSES = [
+#    'django.middleware.cache.UpdateCacheMiddleware',
+    'django.middleware.common.CommonMiddleware',
     'django.middleware.gzip.GZipMiddleware',
 #    'htmlmin.middleware.HtmlMinifyMiddleware',
     'htmlmin.middleware.MarkRequestMiddleware',
@@ -280,6 +282,16 @@ SESSION_ENGINE = "django.contrib.sessions.backends.cache"
 SERVER_EMAIL='admin@rowsandall.com'
 ADMINS = [('Sander','roosendaalsander@gmail.com')]
 
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': 'localhost:11211',
+        'TIMEOUT': 900,
+        }
+    }
+
+CACHE_MIDDLEWARE_ALIAS = 'default'
+CACHE_MIDDLEWARE_SECONDS = 900
 
 # email stuff
 
diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py
index 70354ff5..8720c8b4 100644
--- a/rowsandall_app/settings_dev.py
+++ b/rowsandall_app/settings_dev.py
@@ -49,6 +49,12 @@ TEMPLATE_DEBUG = DEBUG
 
 ALLOWED_HOSTS = ['localhost']
 
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+        'LOCATION': 'C:/python/rowsandallapp/django_cache',
+        }
+    }
 
 # Application definition
 
diff --git a/templates/basebase.html b/templates/basebase.html
index 19551f58..b49d47da 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -154,7 +154,18 @@
 	
       <div class="clear"></div>
       <div class="grid_12">
-	{% block message %}
+        {% if messages %}
+        {% for message in messages %}
+        {% if message.level == DEFAULT_MESSAGE_LEVELS.ERROR %}
+        <p class="message">
+          {% else %}
+        <p class="successmessage">
+          {% endif %}
+          {{ message }}
+        </p>
+          {% endfor %}
+	{% endif %}
+        {% block message %}
 	{% if message %}
 	<p class="message">
 	  {{ message }}