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

Merge branch 'hotfix/v3.15'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-06-15 17:34:30 +02:00
parent 86763c9903 56b955219e
commit e9f00236fb
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/models.py
View File

@@ -349,7 +349,7 @@ def checkworkoutuser(user,workout):
# Workout # Workout
class Workout(models.Model): class Workout(models.Model):
workouttypes = ( workuttypes = (
('water','On-water'), ('water','On-water'),
('rower','Indoor Rower'), ('rower','Indoor Rower'),
('skierg','Ski Erg'), ('skierg','Ski Erg'),

24
rowers/templates/list_workouts.html
View File

@@ -71,15 +71,22 @@
</thead> </thead>
<tbody> <tbody>
{% for workout in workouts %} {% for workout in workouts %}
<tr> {% if workout.rankingpiece %}
<td> {{ workout.date |truncatechars:15}} </td> <tr style="font-weight:bold">
<td> {{ workout.starttime }} </td>
<td>
{% if workout.user.user == user or user == team.manager %}
{% if workout.name != '' %}
<a href="/rowers/workout/{{ workout.id }}/edit">{{ workout.name }}</a> </td>
{% else %} {% else %}
<a href="/rowers/workout/{{ workout.id }}/edit">No Name</a> </td> <tr>
{% endif %}
<td> {{ workout.date |truncatechars:15}} </td>
<td> {{ workout.starttime }} </td>
<td>
{% if workout.user.user == user or user == team.manager %}
{% if workout.rankingpiece %}
[RANKING PIECE]
{% endif %}
{% if workout.name != '' %}
<a href="/rowers/workout/{{ workout.id }}/edit">{{ workout.name }}</a> </td>
{% else %}
<a href="/rowers/workout/{{ workout.id }}/edit">No Name</a> </td>
{% endif %} {% endif %}
{% else %} {% else %}
{% if workout.name != '' %} {% if workout.name != '' %}
@@ -107,7 +114,6 @@
<a class="small" href="/rowers/workout/{{ workout.id }}/deleteconfirm">Delete <a class="small" href="/rowers/workout/{{ workout.id }}/deleteconfirm">Delete
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}