From d2cea56f404fa38e4908b13a1992a18fdc7a06b1 Mon Sep 17 00:00:00 2001 From: Chris Ford Date: Mon, 25 Nov 2013 12:59:18 +0300 Subject: [PATCH] Emergency production fix by @ewheeler. --- .gitignore | 0 .gitmodules | 0 .travis.yml | 0 README.md | 0 cron_edtrac | 0 edtrac_project/.project | 0 edtrac_project/12890.Django-1.3.diff | 0 edtrac_project/__init__.py | 0 .../endless/endless_pagination/__init__.py | 0 .../endless/endless_pagination/decorators.py | 0 .../endless/endless_pagination/exceptions.py | 0 .../locale/de/LC_MESSAGES/django.mo | Bin .../locale/de/LC_MESSAGES/django.po | 0 .../locale/it/LC_MESSAGES/django.mo | Bin .../locale/it/LC_MESSAGES/django.po | 0 edtrac_project/endless/endless_pagination/models.py | 0 .../endless/endless_pagination/paginator.py | 0 .../endless/endless_pagination/settings.py | 0 .../static/endless_pagination/js/endless.js | 0 .../endless_pagination/js/endless_on_scroll.js | 0 .../templates/endless/current_link.html | 0 .../templates/endless/page_link.html | 0 .../templates/endless/show_more.html | 0 .../templates/endless/show_pages.html | 0 .../endless_pagination/templatetags/__init__.py | 0 .../endless_pagination/templatetags/endless.py | 0 edtrac_project/endless/endless_pagination/tests.py | 0 edtrac_project/endless/endless_pagination/utils.py | 0 edtrac_project/endless/endless_pagination/views.py | 0 edtrac_project/favicon.ico | Bin edtrac_project/localsettings.py.example | 0 edtrac_project/rapidsms_edtrac | 2 +- edtrac_project/settings.py | 6 +++++- edtrac_project/travis-settings.py | 0 edtrac_project/urls.py | 0 edtrac_project/wsgi_app.py | 0 requirements.pip | 0 37 files changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .gitmodules mode change 100644 => 100755 .travis.yml mode change 100644 => 100755 README.md mode change 100644 => 100755 cron_edtrac mode change 100644 => 100755 edtrac_project/.project mode change 100644 => 100755 edtrac_project/12890.Django-1.3.diff mode change 100644 => 100755 edtrac_project/__init__.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/__init__.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/decorators.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/exceptions.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/locale/de/LC_MESSAGES/django.mo mode change 100644 => 100755 edtrac_project/endless/endless_pagination/locale/de/LC_MESSAGES/django.po mode change 100644 => 100755 edtrac_project/endless/endless_pagination/locale/it/LC_MESSAGES/django.mo mode change 100644 => 100755 edtrac_project/endless/endless_pagination/locale/it/LC_MESSAGES/django.po mode change 100644 => 100755 edtrac_project/endless/endless_pagination/models.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/paginator.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/settings.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/static/endless_pagination/js/endless.js mode change 100644 => 100755 edtrac_project/endless/endless_pagination/static/endless_pagination/js/endless_on_scroll.js mode change 100644 => 100755 edtrac_project/endless/endless_pagination/templates/endless/current_link.html mode change 100644 => 100755 edtrac_project/endless/endless_pagination/templates/endless/page_link.html mode change 100644 => 100755 edtrac_project/endless/endless_pagination/templates/endless/show_more.html mode change 100644 => 100755 edtrac_project/endless/endless_pagination/templates/endless/show_pages.html mode change 100644 => 100755 edtrac_project/endless/endless_pagination/templatetags/__init__.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/templatetags/endless.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/tests.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/utils.py mode change 100644 => 100755 edtrac_project/endless/endless_pagination/views.py mode change 100644 => 100755 edtrac_project/favicon.ico mode change 100644 => 100755 edtrac_project/localsettings.py.example mode change 100644 => 100755 edtrac_project/settings.py mode change 100644 => 100755 edtrac_project/travis-settings.py mode change 100644 => 100755 edtrac_project/urls.py mode change 100644 => 100755 edtrac_project/wsgi_app.py mode change 100644 => 100755 requirements.pip diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.gitmodules b/.gitmodules old mode 100644 new mode 100755 diff --git a/.travis.yml b/.travis.yml old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/cron_edtrac b/cron_edtrac old mode 100644 new mode 100755 diff --git a/edtrac_project/.project b/edtrac_project/.project old mode 100644 new mode 100755 diff --git a/edtrac_project/12890.Django-1.3.diff b/edtrac_project/12890.Django-1.3.diff old mode 100644 new mode 100755 diff --git a/edtrac_project/__init__.py b/edtrac_project/__init__.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/__init__.py b/edtrac_project/endless/endless_pagination/__init__.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/decorators.py b/edtrac_project/endless/endless_pagination/decorators.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/exceptions.py b/edtrac_project/endless/endless_pagination/exceptions.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/locale/de/LC_MESSAGES/django.mo b/edtrac_project/endless/endless_pagination/locale/de/LC_MESSAGES/django.mo old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/locale/de/LC_MESSAGES/django.po b/edtrac_project/endless/endless_pagination/locale/de/LC_MESSAGES/django.po old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/locale/it/LC_MESSAGES/django.mo b/edtrac_project/endless/endless_pagination/locale/it/LC_MESSAGES/django.mo old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/locale/it/LC_MESSAGES/django.po b/edtrac_project/endless/endless_pagination/locale/it/LC_MESSAGES/django.po old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/models.py b/edtrac_project/endless/endless_pagination/models.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/paginator.py b/edtrac_project/endless/endless_pagination/paginator.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/settings.py b/edtrac_project/endless/endless_pagination/settings.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/static/endless_pagination/js/endless.js b/edtrac_project/endless/endless_pagination/static/endless_pagination/js/endless.js old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/static/endless_pagination/js/endless_on_scroll.js b/edtrac_project/endless/endless_pagination/static/endless_pagination/js/endless_on_scroll.js old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/templates/endless/current_link.html b/edtrac_project/endless/endless_pagination/templates/endless/current_link.html old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/templates/endless/page_link.html b/edtrac_project/endless/endless_pagination/templates/endless/page_link.html old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/templates/endless/show_more.html b/edtrac_project/endless/endless_pagination/templates/endless/show_more.html old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/templates/endless/show_pages.html b/edtrac_project/endless/endless_pagination/templates/endless/show_pages.html old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/templatetags/__init__.py b/edtrac_project/endless/endless_pagination/templatetags/__init__.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/templatetags/endless.py b/edtrac_project/endless/endless_pagination/templatetags/endless.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/tests.py b/edtrac_project/endless/endless_pagination/tests.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/utils.py b/edtrac_project/endless/endless_pagination/utils.py old mode 100644 new mode 100755 diff --git a/edtrac_project/endless/endless_pagination/views.py b/edtrac_project/endless/endless_pagination/views.py old mode 100644 new mode 100755 diff --git a/edtrac_project/favicon.ico b/edtrac_project/favicon.ico old mode 100644 new mode 100755 diff --git a/edtrac_project/localsettings.py.example b/edtrac_project/localsettings.py.example old mode 100644 new mode 100755 diff --git a/edtrac_project/rapidsms_edtrac b/edtrac_project/rapidsms_edtrac index d089229e..b8e72f6b 160000 --- a/edtrac_project/rapidsms_edtrac +++ b/edtrac_project/rapidsms_edtrac @@ -1 +1 @@ -Subproject commit d089229e2c7f01399b9d3e86cb798671261bf593 +Subproject commit b8e72f6b1b11a4ecd13885226bef0bb397b55c6b diff --git a/edtrac_project/settings.py b/edtrac_project/settings.py old mode 100644 new mode 100755 index d1d96dc0..1d77faf1 --- a/edtrac_project/settings.py +++ b/edtrac_project/settings.py @@ -135,9 +135,13 @@ CELERYBEAT_SCHEDULE = { 'runs-every-5-minutes': { - 'task': 'tasks.CreateRecordEnrolledDeployedQuestionsAnswered', + 'task': 'education.tasks.CreateRecordEnrolledDeployedQuestionsAnswered', 'schedule': timedelta(minutes=5) }, + 'runs-every-30-minutes': { + 'task': 'education.tasks.UpdateDashboardVarsCache', + 'schedule': timedelta(minutes=30) + }, } diff --git a/edtrac_project/travis-settings.py b/edtrac_project/travis-settings.py old mode 100644 new mode 100755 diff --git a/edtrac_project/urls.py b/edtrac_project/urls.py old mode 100644 new mode 100755 diff --git a/edtrac_project/wsgi_app.py b/edtrac_project/wsgi_app.py old mode 100644 new mode 100755 diff --git a/requirements.pip b/requirements.pip old mode 100644 new mode 100755