sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'hotfix/v8.37'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-31 07:50:26 +01:00
parent 1f4422a7ba 5d56f66729
commit 085ac1a936
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/views.py
View File

@@ -17091,9 +17091,11 @@ def planmesocyclebyweek(request,id=0,userid=0):
#we're still here. We have permission
sundays = [s for s in allsundays(cycle.startdate,cycle.enddate)]
if sundays[-1] < cycle.enddate:
if sundays and sundays[-1] < cycle.enddate:
sundays = sundays+[cycle.enddate]
else:
sundays = [cycle.enddate]
for i in range(len(sundays)):
if i==0:
monday = cycle.startdate

2
templates/newbase.html
View File

@@ -155,7 +155,7 @@
{% elif user.rower.rowerplan == 'coach' %}
<i class="fas fa-users "></i>
{% elif user.rower.rowerplan == 'plan' %}
<i class="fas fa-user-tie "></i>
<i class="fas fa-user-chart "></i>
{% else %}
<a href="/rowers/me/edit" title="Profile">
<i class="fas fa-user"></i>