rrs: RecipeDetail show milestone instead of all in upgrades table

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
This commit is contained in:
Aníbal Limón 2015-02-20 09:21:35 +00:00 committed by Paul Eggleton
parent f423c40a5d
commit 6752c23362
2 changed files with 16 additions and 3 deletions

View File

@ -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]

View File

@ -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>