Fixes a problem preventing digest last sent dates to be saved correctly.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@486 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index 1dd55ab99266c406483351143b5b6c859b3f5afd..6f68f2c3060914ff5ba93added0b52c066123f22 100644 (file)
--- a/forum/management/commands/send_email_alerts.py
+++ b/forum/management/commands/send_email_alerts.py
@@ -3,7 +3,7 @@ from forum.models import *
 from django.db import models
 from forum.utils.mail import send_template_email
 from django.core.management.base import NoArgsCommand
-from forum.settings.email import EMAIL_DIGEST_CONTROL
+from forum.settings.email import EMAIL_DIGEST_FLAG
 from django.utils import translation
 import logging
 
@@ -79,18 +79,18 @@ class Command(NoArgsCommand):
         except:
             logging.error("Unable to set the locale in the send emails cron job")
 
-        digest_control = EMAIL_DIGEST_CONTROL.value
+        digest_control = EMAIL_DIGEST_FLAG.value
 
         if digest_control is None:
-            digest_control = KeyValue(key='DIGEST_CONTROL', value={
+            digest_control = {
             'LAST_DAILY': datetime.datetime.now() - datetime.timedelta(days=1),
             'LAST_WEEKLY': datetime.datetime.now() - datetime.timedelta(days=1),
-            })
+            }
 
-        from_date = digest_control.value['LAST_DAILY']
-        digest_control.value['LAST_DAILY'] = datetime.datetime.now()
+        from_date = digest_control['LAST_DAILY']
+        digest_control['LAST_DAILY'] = datetime.datetime.now()
 
-        EMAIL_DIGEST_CONTROL.set_value(digest_control)
+        EMAIL_DIGEST_FLAG.set_value(digest_control)
 
         users = User.objects.filter(subscription_settings__enable_notifications=True, subscription_settings__send_digest=True)
         new_members = User.objects.filter(is_active=True, date_joined__gt=from_date).annotate(n_actions=models.Count('actions')).order_by('-n_actions')

diff --git a/forum/settings/email.py b/forum/settings/email.py
index 4efd131384b297784c14a113ba926d608a53dd5e..1a673b239bfd7731df43392b790ce2b29861bcd6 100644 (file)
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -62,4 +62,4 @@ required=False))
 \r
 \r
 \r
-EMAIL_DIGEST_CONTROL = Setting('EMAIL_DIGEST_CONTROL', None)\r
+EMAIL_DIGEST_FLAG = Setting('EMAIL_DIGEST_FLAG', None)\r