release fixes
This commit is contained in:
@@ -27,7 +27,7 @@ from rowsandall_app.settings import SITE_URL
|
|||||||
from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV
|
from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV
|
||||||
from rowsandall_app.settings import PROGRESS_CACHE_SECRET
|
from rowsandall_app.settings import PROGRESS_CACHE_SECRET
|
||||||
from rowsandall_app.settings import SETTINGS_NAME
|
from rowsandall_app.settings import SETTINGS_NAME
|
||||||
|
from rowers.models import UserMessage, Rower, User
|
||||||
|
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
|
|
||||||
@@ -112,6 +112,18 @@ def send_template_email(from_email, to_email, subject,
|
|||||||
else:
|
else:
|
||||||
emailbounced = False
|
emailbounced = False
|
||||||
|
|
||||||
|
try:
|
||||||
|
usr = User.objects.get(email=to_email)
|
||||||
|
umsg = UserMessage(
|
||||||
|
receiver = usr.rower,
|
||||||
|
datetime = timezone.now(),
|
||||||
|
text = text_content,
|
||||||
|
subject=subject,
|
||||||
|
)
|
||||||
|
umsg.save()
|
||||||
|
except User.DoesNotExist:
|
||||||
|
pass
|
||||||
|
|
||||||
if not emailbounced:
|
if not emailbounced:
|
||||||
res = msg.send()
|
res = msg.send()
|
||||||
else: # pragma: no cover
|
else: # pragma: no cover
|
||||||
|
|||||||
@@ -1241,6 +1241,13 @@ class DeleteUserForm(forms.ModelForm):
|
|||||||
model = User
|
model = User
|
||||||
fields = []
|
fields = []
|
||||||
|
|
||||||
|
class UserMessage(models.Model):
|
||||||
|
receiver = models.ForeignKey(Rower, on_delete=models.CASCADE)
|
||||||
|
datetime = models.DateTimeField()
|
||||||
|
isread = models.BooleanField(default=False)
|
||||||
|
text = models.CharField(max_length=1000)
|
||||||
|
subject = models.CharField(max_length=100,default='Message')
|
||||||
|
|
||||||
# requestor is user
|
# requestor is user
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
Binary file not shown.
Reference in New Issue
Block a user