diff options
author | Michael Wood <michael.g.wood@intel.com> | 2015-07-31 15:09:07 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-01 11:26:11 +0100 |
commit | 1b13222e1c031d29419781e41956bedf643ebd74 (patch) | |
tree | db1bc8ea9fa2ea54d888c7cfe5d356c025fb5ffa /bitbake/lib/toaster/toastergui/tables.py | |
parent | df999d2ac162a5be3a65ac4ce771a7466aab2bdb (diff) | |
download | poky-1b13222e1c031d29419781e41956bedf643ebd74.tar.gz |
bitbake: toastergui: Standardise the layer object property layerdetailurl
To be able to use the utility functions in libtoaster we need to have a
single property name for the value that represents the url for the
layer details in the layer object.
(Bitbake rev: 4d64fd0d1236d342b29537f601a68cd23a8255ea)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/tables.py')
-rw-r--r-- | bitbake/lib/toaster/toastergui/tables.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/tables.py b/bitbake/lib/toaster/toastergui/tables.py index 146a8ddeed..782ae80dc2 100644 --- a/bitbake/lib/toaster/toastergui/tables.py +++ b/bitbake/lib/toaster/toastergui/tables.py | |||
@@ -193,7 +193,7 @@ class LayersTable(ToasterTable): | |||
193 | project = Project.objects.get(pk=kwargs['pid']) | 193 | project = Project.objects.get(pk=kwargs['pid']) |
194 | self.add_column(title="LayerDetailsUrl", | 194 | self.add_column(title="LayerDetailsUrl", |
195 | displayable = False, | 195 | displayable = False, |
196 | field_name="layerDetailsUrl", | 196 | field_name="layerdetailurl", |
197 | computation = lambda x: reverse('layerdetails', args=(project.id, x.id))) | 197 | computation = lambda x: reverse('layerdetails', args=(project.id, x.id))) |
198 | 198 | ||
199 | 199 | ||
@@ -208,7 +208,10 @@ class LayerDetails(ToasterTemplateView): | |||
208 | context['layerversion'] = Layer_Version.objects.get(pk=kwargs['layerid']) | 208 | context['layerversion'] = Layer_Version.objects.get(pk=kwargs['layerid']) |
209 | context['layerdict'] = _lv_to_dict(context['project'], context['layerversion']) | 209 | context['layerdict'] = _lv_to_dict(context['project'], context['layerversion']) |
210 | context['layerdeps'] = {"list": [ | 210 | context['layerdeps'] = {"list": [ |
211 | [{"id": y.id, "name": y.layer.name} for y in x.depends_on.get_equivalents_wpriority(context['project'])][0] for x in context['layerversion'].dependencies.all()]} | 211 | [ {"id": y.id, |
212 | "name": y.layer.name, | ||
213 | "layerdetailurl": reverse('layerdetails', args=(kwargs['pid'], y.id)), | ||
214 | } for y in x.depends_on.get_equivalents_wpriority(context['project'])][0] for x in context['layerversion'].dependencies.all()]} | ||
212 | context['projectlayers'] = map(lambda prjlayer: prjlayer.layercommit.id, ProjectLayer.objects.filter(project=context['project'])) | 215 | context['projectlayers'] = map(lambda prjlayer: prjlayer.layercommit.id, ProjectLayer.objects.filter(project=context['project'])) |
213 | 216 | ||
214 | self.context_entries = ['project', 'layerversion', 'projectlayers', 'layerdict', 'layerdeps'] | 217 | self.context_entries = ['project', 'layerversion', 'projectlayers', 'layerdict', 'layerdeps'] |