Merge tag 'commentsfix' into develop
bugfix comment notifications
This commit is contained in:
@@ -29,12 +29,14 @@
|
||||
</tr><tr>
|
||||
<th>Weight Category:</th><td>{{ workout.weightcategory }}</td>
|
||||
</tr>
|
||||
{% if user.is_authenticated %}
|
||||
<tr>
|
||||
<th>Comments</th>
|
||||
<td>
|
||||
<a href="/rowers/workout/{{ workout.id }}/comment">Comment</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
</table>
|
||||
|
||||
<h1>Workout Summary</h1>
|
||||
|
||||
@@ -3341,12 +3341,12 @@ def workout_comment_view(request,id=0):
|
||||
if settings.DEBUG:
|
||||
res = handle_sendemailnewcomment.delay(r.user.first_name,
|
||||
r.user.last_name,
|
||||
r.user.email,
|
||||
c.user.first_name,
|
||||
r.user.email,
|
||||
request.user.first_name,
|
||||
request.user.last_name,
|
||||
comment,w.name,
|
||||
w.id)
|
||||
|
||||
|
||||
elif request.user != r.user:
|
||||
res = queuehigh.enqueue(handle_sendemailnewcomment,r.user.first_name,
|
||||
r.user.last_name,
|
||||
|
||||
Reference in New Issue
Block a user