sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Belen Barros Pena 2015-02-16 16:49:40 +00:00 committed by Richard Purdie
parent 50f11b9d6d
commit d27893dc74
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitbake/lib/toaster/toastergui/templates/bpackage.html
View File

@ -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>

14
bitbake/lib/toaster/toastergui/views.py
View File

@ -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)