Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
|
||||
# All the Team related methods
|
||||
|
||||
# Python
|
||||
@@ -28,6 +29,10 @@ from rowers.tasks import (
|
||||
handle_sendemail_request_reject,handle_sendemail_invite_reject,
|
||||
handle_sendemail_invite_accept,handle_sendemail_team_removed,
|
||||
handle_sendemail_coachrequest,handle_sendemail_coacheerequest,
|
||||
handle_sendemail_coachoffer_rejected,
|
||||
handle_sendemail_coachoffer_accepted,
|
||||
handle_sendemail_coachrequest_rejected,
|
||||
handle_sendemail_coachrequest_accepted,
|
||||
)
|
||||
|
||||
from rowers.models import ValidationError
|
||||
@@ -660,7 +665,7 @@ def send_coachoffer_rejected_email(rekwest):
|
||||
coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name
|
||||
coachemail = rekwest.coach.user.email
|
||||
|
||||
name = rekwest.user.first_name + " " + rekwst.user.last_name
|
||||
name = rekwest.user.first_name + " " + rekwest.user.last_name
|
||||
|
||||
res = myqueue(queuehigh,
|
||||
handle_sendemail_coachoffer_rejected,
|
||||
@@ -670,7 +675,7 @@ def send_coachrequest_rejected_email(rekwest):
|
||||
coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name
|
||||
email = rekwest.user.email
|
||||
|
||||
name = rekwest.user.first_name + " " + rekwst.user.last_name
|
||||
name = rekwest.user.first_name + " " + rekwest.user.last_name
|
||||
|
||||
res = myqueue(queuehigh,
|
||||
handle_sendemail_coachrequest_rejected,
|
||||
@@ -680,7 +685,7 @@ def send_coachrequest_accepted_email(rekwest):
|
||||
coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name
|
||||
email = rekwest.user.email
|
||||
|
||||
name = rekwest.user.first_name + " " + rekwst.user.last_name
|
||||
name = rekwest.user.first_name + " " + rekwest.user.last_name
|
||||
|
||||
res = myqueue(queuehigh,
|
||||
handle_sendemail_coachrequest_accepted,
|
||||
@@ -691,7 +696,7 @@ def send_coachoffer_accepted_email(rekwest):
|
||||
coachname = rekwest.coach.user.first_name + " " + rekwest.coach.user.last_name
|
||||
coachemail = rekwest.coach.user.email
|
||||
|
||||
name = rekwest.user.first_name + " " + rekwst.user.last_name
|
||||
name = rekwest.user.first_name + " " + rekwest.user.last_name
|
||||
|
||||
res = myqueue(queuehigh,
|
||||
handle_sendemail_coachoffer_accepted,
|
||||
|
||||
Reference in New Issue
Block a user