Private
Public Access
1
0

Merge branch 'release/v12.07'

This commit is contained in:
Sander Roosendaal
2020-04-08 13:22:43 +02:00
3 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -4830,7 +4830,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
plot.add_tools(HoverTool(renderers=[l1[cntr]],tooltips=TIPS))
cntr += 1
plot.legend.location='bottom_right'
plot.legend.location='top_right'
plot.xaxis.axis_label = axlabels[xparam]
plot.yaxis.axis_label = axlabels[yparam]
+2
View File
@@ -2730,6 +2730,8 @@ class Workout(models.Model):
def save(self, *args, **kwargs):
user = self.user
if self.notes is not None and len(self.notes)>1000:
self.notes = notes[0:950]
if not can_add_workout(user.user):
raise forms.ValidationError("Free Coach User cannot have any workouts")
+1
View File
@@ -2225,6 +2225,7 @@ def handle_sendemail_request(email, name, code, teamname, requestor, id,
d = {
'requestor':requestor,
'teamname':teamname,
'code': code,
'siteurl':siteurl,
'id':id,
'first_name':name,