summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@intel.com>2015-02-16 16:49:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-20 12:58:20 +0000
commitd27893dc74456423f9ac33674c6ca61b17b701ed (patch)
treee0c056cd58e37cbccf1fad1cdba00f3cebee8bfd /bitbake/lib
parent50f11b9d6dde65a78958fe45842fbbd40e36fb0f (diff)
downloadpoky-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/lib')
-rw-r--r--bitbake/lib/toaster/toastergui/templates/bpackage.html4
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py14
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 2d4948be4b..80229f908d 100644
--- a/bitbake/lib/toaster/toastergui/templates/bpackage.html
+++ b/bitbake/lib/toaster/toastergui/templates/bpackage.html
@@ -88,7 +88,9 @@
88 </a> 88 </a>
89 </td> 89 </td>
90 <!-- Layer directory --> 90 <!-- Layer directory -->
91 <td class="recipe__layer_version__layer__local_path">{{package.recipe.layer_version.layer.local_path}}</td> 91 {% if not MANAGED or not build.project %}
92 <td class="recipe__layer_version__layer__local_path">{{package.recipe.layer_version.layer.local_path}}</td>
93 {% endif %}
92 {%else%} 94 {%else%}
93 <td class="recipe__name"></td> 95 <td class="recipe__name"></td>
94 <td class="recipe__version"></td> 96 <td class="recipe__version"></td>
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 70241dc28b..bf148e20fa 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -1282,9 +1282,11 @@ def bpackage(request, build_id):
1282 1282
1283 packages = _build_page_range(Paginator(queryset, pagesize),request.GET.get('page', 1)) 1283 packages = _build_page_range(Paginator(queryset, pagesize),request.GET.get('page', 1))
1284 1284
1285 build = Build.objects.get( pk = build_id )
1286
1285 context = { 1287 context = {
1286 'objectname': 'packages built', 1288 'objectname': 'packages built',
1287 'build': Build.objects.get(pk=build_id), 1289 'build': build,
1288 'objects' : packages, 1290 'objects' : packages,
1289 'default_orderby' : 'name:+', 1291 'default_orderby' : 'name:+',
1290 'tablecols':[ 1292 'tablecols':[
@@ -1349,16 +1351,20 @@ def bpackage(request, build_id):
1349 'qhelp':'The Git commit of the layer providing the recipe that builds the package', 1351 'qhelp':'The Git commit of the layer providing the recipe that builds the package',
1350 'clclass': 'recipe__layer_version__layer__commit', 'hidden': 1, 1352 'clclass': 'recipe__layer_version__layer__commit', 'hidden': 1,
1351 }, 1353 },
1352 { 1354 ]
1355 }
1356
1357 if not toastermain.settings.MANAGED or build.project is None:
1358
1359 tc_layerDir = {
1353 'name':'Layer directory', 1360 'name':'Layer directory',
1354 'qhelp':'Path to the layer providing the recipe that builds the package', 1361 'qhelp':'Path to the layer providing the recipe that builds the package',
1355 'orderfield': _get_toggle_order(request, "recipe__layer_version__layer__local_path"), 1362 'orderfield': _get_toggle_order(request, "recipe__layer_version__layer__local_path"),
1356 'ordericon':_get_toggle_order_icon(request, "recipe__layer_version__layer__local_path"), 1363 'ordericon':_get_toggle_order_icon(request, "recipe__layer_version__layer__local_path"),
1357 'orderkey' : 'recipe__layer_version__layer__local_path', 1364 'orderkey' : 'recipe__layer_version__layer__local_path',
1358 'clclass': 'recipe__layer_version__layer__local_path', 'hidden': 1, 1365 'clclass': 'recipe__layer_version__layer__local_path', 'hidden': 1,
1359 },
1360 ]
1361 } 1366 }
1367 context['tablecols'].append(tc_layerDir)
1362 1368
1363 response = render(request, template, context) 1369 response = render(request, template, context)
1364 _save_parameters_cookies(response, pagesize, orderby, request) 1370 _save_parameters_cookies(response, pagesize, orderby, request)