From d4dd443421940ee8d319ec35b3324224593bd5aa Mon Sep 17 00:00:00 2001 From: Mariano Lopez Date: Wed, 1 Jul 2015 14:08:09 -0500 Subject: [PATCH] views.py: Fix version in current milestone Fixed the version displayed in current milestone. Before the data was obtained from recipe upgrad table and this allows to fetch the data from the recipe table. Signed-off-by: Mariano Lopez --- rrs/models.py | 7 +++++++ rrs/views.py | 16 ++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/rrs/models.py b/rrs/models.py index a72fa63..702eb0f 100644 --- a/rrs/models.py +++ b/rrs/models.py @@ -429,6 +429,13 @@ class Raw(): return stats + @staticmethod + def get_re_all(): + cur = connection.cursor() + cur.execute("""SELECT id, pn, pv, summary + FROM layerindex_recipe""") + return Raw.dictfetchall(cur) + @staticmethod def get_reupg_by_date(date): cur = connection.cursor() diff --git a/rrs/views.py b/rrs/views.py index 5c458b3..e5126f6 100644 --- a/rrs/views.py +++ b/rrs/views.py @@ -121,10 +121,18 @@ def _get_recipe_list(milestone): maintainers_dict_all = {} current_date = date.today() - recipes = Raw.get_reupg_by_date( - milestone.end_date) - for recipe in recipes: - recipes_ids.append(recipe['id']) + # If the is the curent milestone take the data recipes table + # otherwise take it from recipe upgrade + if current_date >= milestone.start_date and \ + current_date <= milestone.end_date: + recipes = Raw.get_re_all() + else: + recipes = Raw.get_reupg_by_date(milestone.end_date) + + for i,re in enumerate(recipes): + if re.has_key('pv'): + recipes[i]['version'] = re['pv'] + recipes_ids.append(re['id']) if recipe_upstream_history: recipe_upstream_all = Raw.get_reup_by_recipes_and_date(