From a261ae314809d044e18fa5267d951e4941470219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Wed, 8 Jul 2015 11:43:08 -0500 Subject: [PATCH] rrs/views.py: RecipeList always use recipe from Recipe upgrades. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Aníbal Limón --- rrs/views.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/rrs/views.py b/rrs/views.py index 4b05d23..1dd9ddc 100644 --- a/rrs/views.py +++ b/rrs/views.py @@ -117,17 +117,13 @@ def _get_recipe_list(milestone): recipe_list = [] current_date = date.today() for recipe in Recipe.objects.filter().order_by('pn'): - if current_date >= milestone.start_date and \ - current_date <= milestone.end_date: - version = recipe.pv - else: - rup = RecipeUpgrade.get_by_recipe_and_date(recipe, - milestone.end_date) + rup = RecipeUpgrade.get_by_recipe_and_date(recipe, + milestone.end_date) - if rup is None: # Recipe don't exit in this Milestone - continue + if rup is None: # Recipe don't exit in this Milestone + continue - version = rup.version + version = rup.version upstream_version = '' upstream_status = ''