sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'bugfix/upgrade' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-02 10:06:15 +01:00
parent 43c5981dd3 36b99aafea
commit 156560dc9e
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/braintreestuff.py
View File

@@ -1,7 +1,7 @@
import braintree import braintree
from django.utils import timezone from django.utils import timezone
import datetime import datetime
import sys
import django_rq import django_rq
queue = django_rq.get_queue('default') queue = django_rq.get_queue('default')
queuelow = django_rq.get_queue('low') queuelow = django_rq.get_queue('low')

4
rowers/tasks.py
View File

@@ -1738,6 +1738,8 @@ def handle_sendemailnewresponse(first_name, last_name,
from_email = 'Rowsandall <info@rowsandall.com>' from_email = 'Rowsandall <info@rowsandall.com>'
subject = 'New comment on workout ' + workoutname subject = 'New comment on workout ' + workoutname
comment = u''+comment
siteurl = SITE_URL siteurl = SITE_URL
if debug: if debug:
siteurl = SITE_URL_DEV siteurl = SITE_URL_DEV
@@ -1775,6 +1777,8 @@ def handle_sendemailnewcomment(first_name,
from_email = 'Rowsandall <info@rowsandall.com>' from_email = 'Rowsandall <info@rowsandall.com>'
subject = 'New comment on workout ' + workoutname subject = 'New comment on workout ' + workoutname
comment = u''+comment
siteurl = SITE_URL siteurl = SITE_URL
if debug: if debug:
siteurl = SITE_URL_DEV siteurl = SITE_URL_DEV

1
rowsandall_app/urls.py
View File

@@ -33,7 +33,6 @@ handler500 = 'rowers.views.error500_view'
urlpatterns = [ urlpatterns = [
url(r'^admin/jsi18n', 'django.views.i18n.javascript_catalog'),
url('^', include('django.contrib.auth.urls')), url('^', include('django.contrib.auth.urls')),
url(r'^django-rq/',include('django_rq.urls')), url(r'^django-rq/',include('django_rq.urls')),
url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'), url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),