diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/tables.py')
-rw-r--r-- | bitbake/lib/toaster/toastergui/tables.py | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index 902f62f708..79673f5dab 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py | |||
@@ -22,7 +22,7 @@ | |||
22 | from toastergui.widgets import ToasterTable | 22 | from toastergui.widgets import ToasterTable |
23 | from orm.models import Recipe, ProjectLayer, Layer_Version, Machine, Project | 23 | from orm.models import Recipe, ProjectLayer, Layer_Version, Machine, Project |
24 | from orm.models import CustomImageRecipe, Package, Target, Build, LogMessage, Task | 24 | from orm.models import CustomImageRecipe, Package, Target, Build, LogMessage, Task |
25 | from orm.models import CustomImagePackage | 25 | from orm.models import CustomImagePackage, Package_DependencyManager |
26 | from django.db.models import Q, Max, Sum, Count, When, Case, Value, IntegerField | 26 | from django.db.models import Q, Max, Sum, Count, When, Case, Value, IntegerField |
27 | from django.conf.urls import url | 27 | from django.conf.urls import url |
28 | from django.core.urlresolvers import reverse, resolve | 28 | from django.core.urlresolvers import reverse, resolve |
@@ -695,6 +695,7 @@ class PackagesTable(ToasterTable): | |||
695 | 695 | ||
696 | def setup_queryset(self, *args, **kwargs): | 696 | def setup_queryset(self, *args, **kwargs): |
697 | recipe = Recipe.objects.get(pk=kwargs['recipe_id']) | 697 | recipe = Recipe.objects.get(pk=kwargs['recipe_id']) |
698 | self.static_context_extra['target_name'] = recipe.name | ||
698 | 699 | ||
699 | self.queryset = self.create_package_list(recipe, kwargs['pid']) | 700 | self.queryset = self.create_package_list(recipe, kwargs['pid']) |
700 | self.queryset = self.queryset.order_by('name') | 701 | self.queryset = self.queryset.order_by('name') |
@@ -766,7 +767,19 @@ class SelectPackagesTable(PackagesTable): | |||
766 | 767 | ||
767 | self.queryset = self.queryset.order_by('name') | 768 | self.queryset = self.queryset.order_by('name') |
768 | 769 | ||
770 | # This target is the target used to work out which group of dependences | ||
771 | # to display, if we've built the custom image we use it otherwise we | ||
772 | # can use the based recipe instead | ||
773 | if prj.build_set.filter(target__target=self.cust_recipe.name).count()\ | ||
774 | > 0: | ||
775 | self.static_context_extra['target_name'] = self.cust_recipe.name | ||
776 | else: | ||
777 | self.static_context_extra['target_name'] =\ | ||
778 | Package_DependencyManager.TARGET_LATEST | ||
779 | |||
769 | self.static_context_extra['recipe_id'] = kwargs['custrecipeid'] | 780 | self.static_context_extra['recipe_id'] = kwargs['custrecipeid'] |
781 | |||
782 | |||
770 | self.static_context_extra['current_packages'] = \ | 783 | self.static_context_extra['current_packages'] = \ |
771 | current_packages.values_list('pk', flat=True) | 784 | current_packages.values_list('pk', flat=True) |
772 | 785 | ||