Merge branch 'release/v12.28'
This commit is contained in:
@@ -4706,6 +4706,7 @@ def history_view(request,userid=0):
|
|||||||
|
|
||||||
typechoices = [("All","All")]
|
typechoices = [("All","All")]
|
||||||
for wtype in wtypes:
|
for wtype in wtypes:
|
||||||
|
if wtype in mytypes.checktypes:
|
||||||
typechoices.append((wtype,mytypes.workouttypes_ordered[wtype]))
|
typechoices.append((wtype,mytypes.workouttypes_ordered[wtype]))
|
||||||
|
|
||||||
form.fields['workouttype'].choices = typechoices
|
form.fields['workouttype'].choices = typechoices
|
||||||
@@ -4837,6 +4838,7 @@ def history_view_data(request,userid=0):
|
|||||||
|
|
||||||
typechoices = [("All","All")]
|
typechoices = [("All","All")]
|
||||||
for wtype in wtypes:
|
for wtype in wtypes:
|
||||||
|
if wtype in mytypes.checktypes:
|
||||||
typechoices.append((wtype,mytypes.workouttypes_ordered[wtype]))
|
typechoices.append((wtype,mytypes.workouttypes_ordered[wtype]))
|
||||||
|
|
||||||
listofdicts = []
|
listofdicts = []
|
||||||
|
|||||||
Reference in New Issue
Block a user