bitbake: toaster: the customise image button shouldn't rely on targets

The build dashboard customise image button (for creating a new
custom image based on an image recipe used by a build) shouldn't
rely on targets: whether a new custom image can be created or not
depends on whether any of the recipes used by the build are image
recipes.

Modify the method used to determine whether a build has customisable
images to look at the image recipes used during the build, rather
than whether the targets run by the build refer to image recipes.

(Bitbake rev: 6648876c91134bda8498b4f8d7ace9147ec0d985)

Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: bavery <brian.avery@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Elliot Smith 2016-07-12 15:54:55 -07:00 committed by Richard Purdie
parent 2db40e3771
commit 9475a684c4
2 changed files with 4 additions and 9 deletions

View File

@ -449,18 +449,13 @@ class Build(models.Model):
break
return has_images
def has_image_targets(self):
def has_image_recipes(self):
"""
Returns True if a build has any targets which were built from
image recipes.
"""
targets = Target.objects.filter(build_id=self.id)
has_image_targets = False
for target in targets:
if target.is_image:
has_image_targets = True
break
return has_image_targets
image_recipes = self.get_image_recipes()
return len(image_recipes) > 0
def get_image_file_extensions(self):
"""

View File

@ -117,7 +117,7 @@
{% endwith %}
<!-- new custom image from image recipe in this build -->
{% if build.has_image_targets %}
{% if build.has_image_recipes %}
<button class="btn btn-default btn-block navbar-btn" data-role="new-custom-image-trigger">New custom image</button>
{% include 'newcustomimage_modal.html' %}
<script>