diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/views.py')
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 90d47c640c..541b16ab1d 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -515,17 +515,19 @@ def target_common( request, build_id, target_id, variant ): | |||
515 | packages_sum = queryset.aggregate( Sum( 'installed_size' )) | 515 | packages_sum = queryset.aggregate( Sum( 'installed_size' )) |
516 | queryset = _get_queryset( | 516 | queryset = _get_queryset( |
517 | Package, queryset, filter_string, search_term, ordering_string, 'name' ) | 517 | Package, queryset, filter_string, search_term, ordering_string, 'name' ) |
518 | queryset = queryset.select_related("recipe", "recipe__layer_version", "recipe__layer_version__layer") | ||
518 | packages = _build_page_range( Paginator(queryset, pagesize), request.GET.get( 'page', 1 )) | 519 | packages = _build_page_range( Paginator(queryset, pagesize), request.GET.get( 'page', 1 )) |
519 | 520 | ||
520 | 521 | ||
522 | |||
521 | build = Build.objects.get( pk = build_id ) | 523 | build = Build.objects.get( pk = build_id ) |
522 | 524 | ||
523 | # bring in package dependencies | 525 | # bring in package dependencies |
524 | for p in packages.object_list: | 526 | for p in packages.object_list: |
525 | p.runtime_dependencies = p.package_dependencies_source.filter( | 527 | p.runtime_dependencies = p.package_dependencies_source.filter( |
526 | target_id = target_id, dep_type=Package_Dependency.TYPE_TRDEPENDS ) | 528 | target_id = target_id, dep_type=Package_Dependency.TYPE_TRDEPENDS ).select_related("depends_on") |
527 | p.reverse_runtime_dependencies = p.package_dependencies_target.filter( | 529 | p.reverse_runtime_dependencies = p.package_dependencies_target.filter( |
528 | target_id = target_id, dep_type=Package_Dependency.TYPE_TRDEPENDS ) | 530 | target_id = target_id, dep_type=Package_Dependency.TYPE_TRDEPENDS ).select_related("package") |
529 | tc_package = { | 531 | tc_package = { |
530 | 'name' : 'Package', | 532 | 'name' : 'Package', |
531 | 'qhelp' : 'Packaged output resulting from building a recipe included in this image', | 533 | 'qhelp' : 'Packaged output resulting from building a recipe included in this image', |
@@ -2755,7 +2757,7 @@ if toastermain.settings.MANAGED: | |||
2755 | # get unique values for 'name', and select the maximum ID for each entry (the max id is the newest one) | 2757 | # get unique values for 'name', and select the maximum ID for each entry (the max id is the newest one) |
2756 | queryset_with_search_maxids = queryset_with_search.values('name').distinct().annotate(max_id=Max('id')).values_list('max_id') | 2758 | queryset_with_search_maxids = queryset_with_search.values('name').distinct().annotate(max_id=Max('id')).values_list('max_id') |
2757 | 2759 | ||
2758 | queryset_with_search = queryset_with_search.filter(id__in=queryset_with_search_maxids).select_related('layer_version', 'layer_version__layer', 'layer_version__up_branch') | 2760 | queryset_with_search = queryset_with_search.filter(id__in=queryset_with_search_maxids).select_related('layer_version', 'layer_version__layer', 'layer_version__up_branch', 'layer_source') |
2759 | 2761 | ||
2760 | 2762 | ||
2761 | # retrieve the objects that will be displayed in the table; targets a paginator and gets a page range to display | 2763 | # retrieve the objects that will be displayed in the table; targets a paginator and gets a page range to display |
@@ -2763,7 +2765,11 @@ if toastermain.settings.MANAGED: | |||
2763 | 2765 | ||
2764 | for e in target_info.object_list: | 2766 | for e in target_info.object_list: |
2765 | e.preffered_layerversion = e.layer_version.get_equivalents_wpriority(prj)[0] | 2767 | e.preffered_layerversion = e.layer_version.get_equivalents_wpriority(prj)[0] |
2766 | 2768 | e.vcs_link_url = Layer.objects.filter(name = e.preffered_layerversion.layer.name).exclude(vcs_web_file_base_url__isnull=True)[0].vcs_web_file_base_url | |
2769 | if e.vcs_link_url != None: | ||
2770 | fp = e.preffered_layerversion.dirpath + "/" + e.file_path | ||
2771 | e.vcs_link_url = e.vcs_link_url.replace('%path%', fp) | ||
2772 | e.vcs_link_url = e.vcs_link_url.replace('%branch%', e.preffered_layerversion.up_branch.name) | ||
2767 | 2773 | ||
2768 | context = { | 2774 | context = { |
2769 | 'projectlayerset' : jsonfilter(map(lambda x: x.layercommit.id, prj.projectlayer_set.all().select_related("layercommit"))), | 2775 | 'projectlayerset' : jsonfilter(map(lambda x: x.layercommit.id, prj.projectlayer_set.all().select_related("layercommit"))), |