Should fix the error reported in http://meta.osqa.net/questions/4487/error-500-when...

[osqa.git] / forum / management / commands / send_email_alerts.py

diff --git a/forum/management/commands/send_email_alerts.py b/forum/management/commands/send_email_alerts.py
index 4cdb2e1d35636fa27a5061539d83095db69a067c..4bc99513de53f6e6fed619ba1349d001c384a231 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 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
 
 from django.utils import translation
 import logging
 


@@ -79,20 +79,20 @@ class Command(NoArgsCommand):
         except:
             logging.error("Unable to set the locale in the send emails cron job")
 
         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:
 
         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),
             '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)
+        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')
 
         new_member_count = new_members.count()
         new_members = User.objects.filter(is_active=True, date_joined__gt=from_date).annotate(n_actions=models.Count('actions')).order_by('-n_actions')
 
         new_member_count = new_members.count()


@@ -105,6 +105,9 @@ class Command(NoArgsCommand):
 
         digest = DigestQuestionsIndex(from_date)
 
 
         digest = DigestQuestionsIndex(from_date)
 

+        if (not new_member_count) and (not digest.count):
+            return
+

         send_template_email(users, "notifications/digest.html", locals())
 
 
         send_template_email(users, "notifications/digest.html", locals())