diff options
author | Belen Barros Pena <belen.barros.pena@intel.com> | 2015-02-16 16:49:40 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-20 12:58:20 +0000 |
commit | d27893dc74456423f9ac33674c6ca61b17b701ed (patch) | |
tree | e0c056cd58e37cbccf1fad1cdba00f3cebee8bfd /bitbake | |
parent | 50f11b9d6dde65a78958fe45842fbbd40e36fb0f (diff) | |
download | ast2050-yocto-poky-d27893dc74456423f9ac33674c6ca61b17b701ed.zip ast2050-yocto-poky-d27893dc74456423f9ac33674c6ca61b17b701ed.tar.gz |
bitbake: toasterui: remove layer directory in managed mode
Removes the layer directory information from the packages
built page when in managed mode.
[YOCTO #7221]
(Bitbake rev: 1eaf60d0fe34f5f43386c6f0e91f0b26c7a62845)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/bpackage.html | 4 | ||||
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/bpackage.html b/bitbake/lib/toaster/toastergui/templates/bpackage.html index 2d4948b..80229f9 100644 --- a/bitbake/lib/toaster/toastergui/templates/bpackage.html +++ b/bitbake/lib/toaster/toastergui/templates/bpackage.html @@ -88,7 +88,9 @@ </a> </td> <!-- Layer directory --> - <td class="recipe__layer_version__layer__local_path">{{package.recipe.layer_version.layer.local_path}}</td> + {% if not MANAGED or not build.project %} + <td class="recipe__layer_version__layer__local_path">{{package.recipe.layer_version.layer.local_path}}</td> + {% endif %} {%else%} <td class="recipe__name"></td> <td class="recipe__version"></td> diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 70241dc..bf148e2 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -1282,9 +1282,11 @@ def bpackage(request, build_id): packages = _build_page_range(Paginator(queryset, pagesize),request.GET.get('page', 1)) + build = Build.objects.get( pk = build_id ) + context = { 'objectname': 'packages built', - 'build': Build.objects.get(pk=build_id), + 'build': build, 'objects' : packages, 'default_orderby' : 'name:+', 'tablecols':[ @@ -1349,16 +1351,20 @@ def bpackage(request, build_id): 'qhelp':'The Git commit of the layer providing the recipe that builds the package', 'clclass': 'recipe__layer_version__layer__commit', 'hidden': 1, }, - { + ] + } + + if not toastermain.settings.MANAGED or build.project is None: + + tc_layerDir = { 'name':'Layer directory', 'qhelp':'Path to the layer providing the recipe that builds the package', 'orderfield': _get_toggle_order(request, "recipe__layer_version__layer__local_path"), 'ordericon':_get_toggle_order_icon(request, "recipe__layer_version__layer__local_path"), 'orderkey' : 'recipe__layer_version__layer__local_path', 'clclass': 'recipe__layer_version__layer__local_path', 'hidden': 1, - }, - ] } + context['tablecols'].append(tc_layerDir) response = render(request, template, context) _save_parameters_cookies(response, pagesize, orderby, request) |