From 4d7944d6adda400af9f8188a7d3de526a2a94384 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Tue, 4 Aug 2015 22:46:37 +0300 Subject: bitbake: toastergui: views Standardise the fields project layer response We need to keep consistent the field names of these objects so that we can use the object response from different calls. e.g. layer dependences or listing layers in the project. (Bitbake rev: 5c7004908f6916c0d279299c47b9dca3237148ec) Signed-off-by: Michael Wood Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- bitbake/lib/toaster/toastergui/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 6a219ede0c..4563eaf01a 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -2224,9 +2224,10 @@ if True: "id": x.layercommit.pk, "orderid": x.pk, "name" : x.layercommit.layer.name, - "giturl": x.layercommit.layer.vcs_url, + "vcs_url": x.layercommit.layer.vcs_url, + "vcs_reference" : x.layercommit.get_vcs_reference(), "url": x.layercommit.layer.layer_index_url, - "layerdetailurl": reverse("layerdetails", args=(prj.id, x.layercommit.pk,)), + "layerdetailurl": x.layercommit.get_detailspage_url(prj.pk), # This branch name is actually the release "branch" : { "name" : x.layercommit.get_vcs_reference(), "layersource" : x.layercommit.up_branch.layer_source.name if x.layercommit.up_branch != None else None}}, prj.projectlayer_set.all().order_by("id")), -- cgit v1.2.3-54-g00ecf