diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/views.py')
-rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 761bf53a11..d451c3b927 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -28,6 +28,8 @@ from django.shortcuts import render, redirect | |||
28 | from orm.models import Build, Target, Task, Layer, Layer_Version, Recipe, LogMessage, Variable | 28 | from orm.models import Build, Target, Task, Layer, Layer_Version, Recipe, LogMessage, Variable |
29 | from orm.models import Task_Dependency, Recipe_Dependency, Package, Package_File, Package_Dependency | 29 | from orm.models import Task_Dependency, Recipe_Dependency, Package, Package_File, Package_Dependency |
30 | from orm.models import Target_Installed_Package, Target_File, Target_Image_File, BuildArtifact | 30 | from orm.models import Target_Installed_Package, Target_File, Target_Image_File, BuildArtifact |
31 | from bldcontrol.models import BuildEnvironment, BuildRequest | ||
32 | from bldcontrol import bbcontroller | ||
31 | from django.views.decorators.cache import cache_control | 33 | from django.views.decorators.cache import cache_control |
32 | from django.core.urlresolvers import reverse | 34 | from django.core.urlresolvers import reverse |
33 | from django.core.exceptions import MultipleObjectsReturned | 35 | from django.core.exceptions import MultipleObjectsReturned |
@@ -39,6 +41,7 @@ from datetime import timedelta, datetime, date | |||
39 | from django.utils import formats | 41 | from django.utils import formats |
40 | from toastergui.templatetags.projecttags import json as jsonfilter | 42 | from toastergui.templatetags.projecttags import json as jsonfilter |
41 | import json | 43 | import json |
44 | from os.path import dirname | ||
42 | 45 | ||
43 | # all new sessions should come through the landing page; | 46 | # all new sessions should come through the landing page; |
44 | # determine in which mode we are running in, and redirect appropriately | 47 | # determine in which mode we are running in, and redirect appropriately |
@@ -1300,11 +1303,6 @@ def configvars(request, build_id): | |||
1300 | 1303 | ||
1301 | variables = _build_page_range(Paginator(queryset, pagesize), request.GET.get('page', 1)) | 1304 | variables = _build_page_range(Paginator(queryset, pagesize), request.GET.get('page', 1)) |
1302 | 1305 | ||
1303 | layers = Layer.objects.filter(layer_version_layer__projectlayer__project__build=build_id).order_by("-name") | ||
1304 | layer_names = map(lambda layer : layer.name, layers) | ||
1305 | # special case for meta built-in layer | ||
1306 | layer_names.append('meta') | ||
1307 | |||
1308 | # show all matching files (not just the last one) | 1306 | # show all matching files (not just the last one) |
1309 | file_filter= search_term + ":" | 1307 | file_filter= search_term + ":" |
1310 | if filter_string.find('/conf/') > 0: | 1308 | if filter_string.find('/conf/') > 0: |
@@ -1317,6 +1315,15 @@ def configvars(request, build_id): | |||
1317 | file_filter += '/bitbake.conf' | 1315 | file_filter += '/bitbake.conf' |
1318 | build_dir=re.sub("/tmp/log/.*","",Build.objects.get(pk=build_id).cooker_log_path) | 1316 | build_dir=re.sub("/tmp/log/.*","",Build.objects.get(pk=build_id).cooker_log_path) |
1319 | 1317 | ||
1318 | clones = [] | ||
1319 | for breq in BuildRequest.objects.filter(build_id=build_id): | ||
1320 | bc = bbcontroller.getBuildEnvironmentController(pk = breq.environment.id) | ||
1321 | for brl in breq.brlayer_set.all(): | ||
1322 | localdirname = bc.getGitCloneDirectory(brl.giturl, brl.commit) | ||
1323 | if not localdirname.startswith("/"): | ||
1324 | localdirname = os.path.join(bc.be.sourcedir, localdirname) | ||
1325 | clones.append(localdirname) | ||
1326 | |||
1320 | context = { | 1327 | context = { |
1321 | 'objectname': 'configvars', | 1328 | 'objectname': 'configvars', |
1322 | 'object_search_display':'BitBake variables', | 1329 | 'object_search_display':'BitBake variables', |
@@ -1327,7 +1334,7 @@ def configvars(request, build_id): | |||
1327 | 'total_count':queryset_with_search.count(), | 1334 | 'total_count':queryset_with_search.count(), |
1328 | 'default_orderby' : 'variable_name:+', | 1335 | 'default_orderby' : 'variable_name:+', |
1329 | 'search_term':search_term, | 1336 | 'search_term':search_term, |
1330 | 'layer_names' : layer_names, | 1337 | 'dirstostrip': clones + [dirname(build_dir), dirname(dirname(build_dir))], |
1331 | # Specifies the display of columns for the table, appearance in "Edit columns" box, toggling default show/hide, and specifying filters for columns | 1338 | # Specifies the display of columns for the table, appearance in "Edit columns" box, toggling default show/hide, and specifying filters for columns |
1332 | 'tablecols' : [ | 1339 | 'tablecols' : [ |
1333 | {'name': 'Variable', | 1340 | {'name': 'Variable', |