diff options
| -rw-r--r-- | bitbake/lib/toaster/orm/models.py | 12 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/tables.py | 4 | ||||
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 5 |
3 files changed, 8 insertions, 13 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 3dc4d6d891e..ac2aa9e469b 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -477,15 +477,9 @@ class Build(models.Model): targets in this build """ targets = self.target_set.all() - target_labels = [] - target_label = None - - for target in targets: - target_label = target.target - if target.task: - target_label = target_label + ':' + target.task - target_labels.append(target_label) - + target_labels = [target.target + + (':' + target.task if target.task else '') + for target in targets] target_labels.sort() return target_labels diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index 227973114cb..e9f1fdccb1f 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py @@ -688,7 +688,9 @@ class ProjectsTable(ToasterTable): self.queryset = queryset - # columns: last activity on (updated) - DEFAULT, project (name), release, machine, number of builds, last build outcome, recipe (name), errors, warnings, image files + # columns: last activity on (updated) - DEFAULT, project (name), release, + # machine, number of builds, last build outcome, recipe (name), errors, + # warnings, image files def setup_columns(self, *args, **kwargs): name_template = ''' {% load project_url_tag %} diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 4f7b50f9dc8..59e16b27b20 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -462,7 +462,7 @@ def builddashboard( request, build_id ): for t in tgts: elem = { } elem[ 'target' ] = t - if ( t.is_image ): + if t.is_image: hasImages = True npkg = 0 pkgsz = 0 @@ -481,8 +481,7 @@ def builddashboard( request, build_id ): ndx = 0; f = i.file_name[ ndx + 1: ] imageFiles.append({ 'id': i.id, 'path': f, 'size' : i.file_size }) - if ( t.is_image and - (( len( imageFiles ) <= 0 ) or ( len( t.license_manifest_path ) <= 0 ))): + if t.is_image and (len(imageFiles) <= 0 or len(t.license_manifest_path) <= 0): targetHasNoImages = True elem[ 'imageFiles' ] = imageFiles elem[ 'targetHasNoImages' ] = targetHasNoImages |