summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-09-28 21:45:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-29 14:11:38 +0100
commit17fe16bbf4e375f941c44bcef2a205cf2ee6118f (patch)
tree365ece7a11f7ac5843511fa7ba066ed55140b7d6 /bitbake
parentaed6d2e8c04bad9e1bf1e89e5bc663ae6afb80d9 (diff)
downloadpoky-17fe16bbf4e375f941c44bcef2a205cf2ee6118f.tar.gz
bitbake: toaster: tables show all recipes in the layerdetails even duplicates
For some layers we have multiple recipes for the same software with differing versions. Change to showing all versions and add a version column to the table instead. (Bitbake rev: 8480e275e87275921d0dd54f2a7a445b1cd40203) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/toaster/toastergui/tables.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py
index 1526d59004..3354072e13 100644
--- a/bitbake/lib/toaster/toastergui/tables.py
+++ b/bitbake/lib/toaster/toastergui/tables.py
@@ -403,8 +403,8 @@ class LayerRecipesTable(RecipesTable):
403 403
404 404
405 def setup_queryset(self, *args, **kwargs): 405 def setup_queryset(self, *args, **kwargs):
406 RecipesTable.setup_queryset(self, *args, **kwargs) 406 self.queryset = \
407 self.queryset = self.queryset.filter(layer_version__pk=int(kwargs['layerid'])) 407 Recipe.objects.filter(layer_version__pk=int(kwargs['layerid']))
408 408
409 self.static_context_extra['in_prj'] = ProjectLayer.objects.filter(Q(project=kwargs['pid']) & Q(layercommit=kwargs['layerid'])).count() 409 self.static_context_extra['in_prj'] = ProjectLayer.objects.filter(Q(project=kwargs['pid']) & Q(layercommit=kwargs['layerid'])).count()
410 410
@@ -418,6 +418,8 @@ class LayerRecipesTable(RecipesTable):
418 self.add_column(title="Description", 418 self.add_column(title="Description",
419 field_name="get_description_or_summary") 419 field_name="get_description_or_summary")
420 420
421 self.add_column(title="Version",
422 field_name="version")
421 423
422 build_recipe_template ='<button class="btn btn-block build-recipe-btn" data-recipe-name="{{data.name}}" {%if extra.in_prj == 0 %}disabled="disabled"{%endif%}>Build recipe</button>' 424 build_recipe_template ='<button class="btn btn-block build-recipe-btn" data-recipe-name="{{data.name}}" {%if extra.in_prj == 0 %}disabled="disabled"{%endif%}>Build recipe</button>'
423 425