diff options
| -rw-r--r-- | rrs/models.py | 3 | ||||
| -rw-r--r-- | templates/rrs/recipedetail.html | 16 |
2 files changed, 16 insertions, 3 deletions
diff --git a/rrs/models.py b/rrs/models.py index 9ed74a1dca..55cf1b2710 100644 --- a/rrs/models.py +++ b/rrs/models.py @@ -75,7 +75,8 @@ class Milestone(models.Model): @staticmethod def get_by_release_and_date(release, date): milestone_set = Milestone.objects.filter(release = release, - start_date__lte = date, end_date__gte = date).order_by('-end_date') + start_date__lte = date, end_date__gte = date). \ + exclude(name = 'All').order_by('-end_date') if milestone_set: return milestone_set[0] diff --git a/templates/rrs/recipedetail.html b/templates/rrs/recipedetail.html index 1506fec127..47958225b6 100644 --- a/templates/rrs/recipedetail.html +++ b/templates/rrs/recipedetail.html @@ -78,9 +78,21 @@ <td>{{ rud.title }}</td> <td>{{ rud.version }}</td> {% if rud.milestone_name %} - <td><a href="{% url recipes rud.release_name rud.milestone_name %}">{{ rud.milestone_name }}</a></td> + <td> + <a href="{% url recipes rud.release_name rud.milestone_name %}"> + {{ rud.release_name }} + {% if rud.milestone_name != "All" %} + {{ rud.milestone_name }} + {% endif %} + </a> + </td> {% else %} - <td>{{ rud.milestone_name }}</td> + <td> + {{ rud.release_name }} + {% if rud.milestone_name != "All" %} + {{ rud.milestone_name }} + {% endif %} + </td> {% endif %} <td>{{ rud.date }}</td> |