From c80b7dfee230dc92bb7134620e0e12cc7f925614 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Mon, 7 Dec 2015 18:15:43 +0000 Subject: bitbake: toaster: orm get_project_layer_versions to return layer_version objects Instead of returning layercommits return the actual Layer_Version objects for the layercommit as these are the useful objects which contain the metadata. (Bitbake rev: 480f0d307a3183df16fd383c7a3f96f00d09fbd4) Signed-off-by: Michael Wood Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/toaster/orm/models.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/toaster') diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index f826bcea34..874b58ecba 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py @@ -265,12 +265,13 @@ class Project(models.Model): def get_project_layer_versions(self, pk=False): """ Returns the Layer_Versions currently added to this project """ - layer_versions = self.projectlayer_set.all().values('layercommit') + layer_versions = self.projectlayer_set.all().values_list('layercommit', + flat=True) if pk is False: - return layer_versions + return Layer_Version.objects.filter(pk__in=layer_versions) else: - return layer_versions.values_list('layercommit__pk', flat=True) + return layer_versions def get_available_machines(self): -- cgit v1.2.3-54-g00ecf