Merge branch 'release/v12.07'
This commit is contained in:
@@ -4830,7 +4830,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
|
|||||||
plot.add_tools(HoverTool(renderers=[l1[cntr]],tooltips=TIPS))
|
plot.add_tools(HoverTool(renderers=[l1[cntr]],tooltips=TIPS))
|
||||||
cntr += 1
|
cntr += 1
|
||||||
|
|
||||||
plot.legend.location='bottom_right'
|
plot.legend.location='top_right'
|
||||||
plot.xaxis.axis_label = axlabels[xparam]
|
plot.xaxis.axis_label = axlabels[xparam]
|
||||||
plot.yaxis.axis_label = axlabels[yparam]
|
plot.yaxis.axis_label = axlabels[yparam]
|
||||||
|
|
||||||
|
|||||||
@@ -2730,6 +2730,8 @@ class Workout(models.Model):
|
|||||||
|
|
||||||
def save(self, *args, **kwargs):
|
def save(self, *args, **kwargs):
|
||||||
user = self.user
|
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):
|
if not can_add_workout(user.user):
|
||||||
raise forms.ValidationError("Free Coach User cannot have any workouts")
|
raise forms.ValidationError("Free Coach User cannot have any workouts")
|
||||||
|
|
||||||
|
|||||||
@@ -2225,6 +2225,7 @@ def handle_sendemail_request(email, name, code, teamname, requestor, id,
|
|||||||
d = {
|
d = {
|
||||||
'requestor':requestor,
|
'requestor':requestor,
|
||||||
'teamname':teamname,
|
'teamname':teamname,
|
||||||
|
'code': code,
|
||||||
'siteurl':siteurl,
|
'siteurl':siteurl,
|
||||||
'id':id,
|
'id':id,
|
||||||
'first_name':name,
|
'first_name':name,
|
||||||
|
|||||||
Reference in New Issue
Block a user