patch email_change

requirements_versioned.pip

@@ -24,7 +24,7 @@ certifi==2015.04.28
 django-celery==3.0.9
 django-ckeditor==4.5.1
 #django-email-change==0.2.3
-git+git://github.com/novagile/django-email-change.git@0d7cb91b987a0505a9c4bde126d452233dea266d
+git+git://github.com/eshellman/django-email-change.git@ad50f72eb8f794e24bea92f85683c4b351562c50
 django-endless-pagination==2.0
 django-extensions==0.9
 django-jsonfield==0.9.10

settings/common.py

@@ -347,12 +347,6 @@ UPDATE_ACTIVE_CAMPAIGN_STATUSES = {
     "args": ()
 }
 
-EMIT_NOTIFICATIONS_JOB = {
-    "task": "regluit.core.tasks.emit_notifications",
-    "schedule": datetime.timedelta(seconds=60),
-    "args": ()    
-}
-
 EBOOK_NOTIFICATIONS_JOB = {
     "task": "regluit.core.tasks.report_new_ebooks",
     "schedule": crontab(hour=0, minute=30),

settings/dev.py

@@ -120,7 +120,6 @@ MAINTENANCE_MODE = False
 
 # decide which of the period tasks to add to the schedule
 #CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB
-#CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB
 CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB
 
 try:

settings/just.py

@@ -116,8 +116,6 @@ IS_PREVIEW = False
 CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB
 CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB
 
-# doing emit_notifications in crontab right now
-#CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB
 
 CELERYBEAT_SCHEDULE['update_account_statuses'] = UPDATE_ACCOUNT_STATUSES
 CELERYBEAT_SCHEDULE['notify_expiring_accounts'] = NOTIFY_EXPIRING_ACCOUNTS

settings/localvm.py

@@ -106,7 +106,6 @@ IS_PREVIEW = False
 #CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB
 CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB
 
-CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB
 
 
 # local settings for maintenance mode

settings/please.py

@@ -103,7 +103,6 @@ IS_PREVIEW = False
 #CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB
 CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB
 
-CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB
 
 
 # local settings for maintenance mode

settings/prod.py

@@ -112,7 +112,6 @@ STATIC_ROOT = '/var/www/static'
 
 # decide which of the period tasks to add to the schedule
 CELERYBEAT_SCHEDULE['send_test_email'] = SEND_TEST_EMAIL_JOB
-#CELERYBEAT_SCHEDULE['emit_notifications'] = EMIT_NOTIFICATIONS_JOB
 # update the statuses of campaigns
 CELERYBEAT_SCHEDULE['update_active_campaign_statuses'] = UPDATE_ACTIVE_CAMPAIGN_STATUSES
 CELERYBEAT_SCHEDULE['report_new_ebooks'] = EBOOK_NOTIFICATIONS_JOB

survey/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
 from .views import SurveyView
 
 

test/campaigntest.py

@@ -351,10 +351,8 @@ def test_relaunch(unglue_it_url = settings.LIVE_SERVER_TEST_URL, do_local=True,
 def successful_campaign_signal():
     """fire off a success_campaign signal and send notifications"""
     import regluit
-    from notification.engine import send_all
     c = regluit.core.models.Campaign.objects.get(id=3)
     regluit.core.signals.successful_campaign.send(sender=None, campaign=c)
-    send_all()
     
 
 def berkeley_search():

urls.py

@@ -1,6 +1,4 @@
-import notification.urls
+from django.conf.urls import patterns, url, include
-
-from django.conf.urls.defaults import *
 
 from frontend.views import social_auth_reset_password
 from regluit.admin import admin_site
@@ -23,7 +21,7 @@ urlpatterns = patterns('',
     url(r'^selectable/', include('selectable.urls')),
     url(r'^admin/', include(admin_site.urls)), 
     url(r'^comments/', include('django.contrib.comments.urls')),
-    url(r'^notification/', include(notification.urls)),
+    url(r"^notification/", include('notification.urls')),
     url(r'^ckeditor/', include('ckeditor.urls')),
 )