MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

RRS: fix showing all recipes for multi-layer maintenance plans

Browse Source 
If you had more than one layer on a maintenance plan, only the recipes
from the last layer were shown because we were using a recipe list
variable from the last iteration. The fix just turned out to be to
indent the code that read from that list so it runs every iteration
instead of at the end.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2019-02-21 13:51:34 +13:00
parent 7ab7766ec7
commit 03b39e89c0
1 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
rrs/views.py
View File

@ -422,59 +422,59 @@ def _get_recipe_list(milestone):
for ma in maintainers_all: for ma in maintainers_all:
maintainers_dict_all[ma['recipe_id']] = ma['name'] maintainers_dict_all[ma['recipe_id']] = ma['name']
for recipe in recipes: for recipe in recipes:
upstream_version = '' upstream_version = ''
upstream_status = '' upstream_status = ''
no_update_reason = '' no_update_reason = ''
outdated = '' outdated = ''
if recipe_upstream_history: if recipe_upstream_history:
recipe_upstream = recipe_upstream_dict_all.get(recipe['id']) recipe_upstream = recipe_upstream_dict_all.get(recipe['id'])
if not recipe_upstream: if not recipe_upstream:
recipe_add = Recipe.objects.filter(id = recipe['id'])[0] recipe_add = Recipe.objects.filter(id = recipe['id'])[0]
recipe_upstream_add = RecipeUpstream() recipe_upstream_add = RecipeUpstream()
recipe_upstream_add.history = recipe_upstream_history recipe_upstream_add.history = recipe_upstream_history
recipe_upstream_add.recipe = recipe_add recipe_upstream_add.recipe = recipe_add
recipe_upstream_add.version = '' recipe_upstream_add.version = ''
recipe_upstream_add.type = 'M' # Manual recipe_upstream_add.type = 'M' # Manual
recipe_upstream_add.status = 'U' # Unknown recipe_upstream_add.status = 'U' # Unknown
recipe_upstream_add.no_update_reason = '' recipe_upstream_add.no_update_reason = ''
recipe_upstream_add.date = recipe_upstream_history.end_date recipe_upstream_add.date = recipe_upstream_history.end_date
recipe_upstream_add.save() recipe_upstream_add.save()
recipe_upstream = {'version': '', 'status': 'U', 'type': 'M', recipe_upstream = {'version': '', 'status': 'U', 'type': 'M',
'no_update_reason': ''} 'no_update_reason': ''}
if recipe_upstream['status'] == 'N' and recipe_upstream['no_update_reason']: if recipe_upstream['status'] == 'N' and recipe_upstream['no_update_reason']:
recipe_upstream['status'] = 'C' recipe_upstream['status'] = 'C'
upstream_status = \ upstream_status = \
RecipeUpstream.RECIPE_UPSTREAM_STATUS_CHOICES_DICT[ RecipeUpstream.RECIPE_UPSTREAM_STATUS_CHOICES_DICT[
recipe_upstream['status']] recipe_upstream['status']]
if upstream_status == 'Downgrade': if upstream_status == 'Downgrade':
upstream_status = 'Unknown' # Downgrade is displayed as Unknown upstream_status = 'Unknown' # Downgrade is displayed as Unknown
upstream_version = recipe_upstream['version'] upstream_version = recipe_upstream['version']
no_update_reason = recipe_upstream['no_update_reason'] no_update_reason = recipe_upstream['no_update_reason']
#Get how long the recipe hasn't been updated #Get how long the recipe hasn't been updated
recipe_last_updated = \ recipe_last_updated = \
recipe_last_updated_dict_all.get(recipe['id']) recipe_last_updated_dict_all.get(recipe['id'])
if recipe_last_updated: if recipe_last_updated:
recipe_date = recipe_last_updated['date'] recipe_date = recipe_last_updated['date']
outdated = recipe_date.date().isoformat() outdated = recipe_date.date().isoformat()
else: else:
outdated = "" outdated = ""
maintainer_name = maintainers_dict_all.get(recipe['id'], '') maintainer_name = maintainers_dict_all.get(recipe['id'], '')
recipe_list_item = RecipeList(recipe['id'], recipe['pn'], recipe['summary']) recipe_list_item = RecipeList(recipe['id'], recipe['pn'], recipe['summary'])
recipe_list_item.version = recipe['version'] recipe_list_item.version = recipe['version']
recipe_list_item.upstream_status = upstream_status recipe_list_item.upstream_status = upstream_status
recipe_list_item.upstream_version = upstream_version recipe_list_item.upstream_version = upstream_version
recipe_list_item.outdated = outdated recipe_list_item.outdated = outdated
patches = Patch.objects.filter(recipe__id=recipe['id']) patches = Patch.objects.filter(recipe__id=recipe['id'])
recipe_list_item.patches_total = patches.count() recipe_list_item.patches_total = patches.count()
recipe_list_item.patches_pending = patches.filter(status='P').count() recipe_list_item.patches_pending = patches.filter(status='P').count()
recipe_list_item.maintainer_name = maintainer_name recipe_list_item.maintainer_name = maintainer_name
recipe_list_item.no_update_reason = no_update_reason recipe_list_item.no_update_reason = no_update_reason
recipe_list.append(recipe_list_item) recipe_list.append(recipe_list_item)
return recipe_list return recipe_list