diff options
| author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-03-09 17:08:53 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-16 17:44:04 +0000 |
| commit | cffc2081cb0a2c6dcfe3730b68c1c20fbac0538d (patch) | |
| tree | 0f6a917338203397f1df89af87cdcbafccf30dec /bitbake | |
| parent | c8714ec0cdcf84d31d9bd944df1923ea7e4339b4 (diff) | |
| download | ast2050-yocto-poky-cffc2081cb0a2c6dcfe3730b68c1c20fbac0538d.zip ast2050-yocto-poky-cffc2081cb0a2c6dcfe3730b68c1c20fbac0538d.tar.gz | |
bitbake: toastergui: suggestion in alphabetical order
Patch bringing ordering in alphabetical order for
targets, machines and layers suggestion in typeaheads.
[YOCTO #7152]
(Bitbake rev: de1a1504967b1c2df701f5b7496004f8cd68c407)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 1e9df3f..a07f720 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -2304,7 +2304,7 @@ if toastermain.settings.MANAGED: # and show only the selected layers for this project final_list = set([x.get_equivalents_wpriority(prj)[0] for x in queryset_all]) - return HttpResponse(jsonfilter( { "error":"ok", "list" : map( _lv_to_dict, final_list) }), content_type = "application/json") + return HttpResponse(jsonfilter( { "error":"ok", "list" : map( _lv_to_dict, sorted(final_list, key = lambda x: x.layer.name)) }), content_type = "application/json") # returns layer dependencies for a layer, excluding current project layers @@ -2314,7 +2314,7 @@ if toastermain.settings.MANAGED: final_list = set([x.get_equivalents_wpriority(prj)[0] for x in queryset]) - return HttpResponse(jsonfilter( { "error":"ok", "list" : map( _lv_to_dict, final_list) }), content_type = "application/json") + return HttpResponse(jsonfilter( { "error":"ok", "list" : map( _lv_to_dict, sorted(final_list, key = lambda x: x.layer.name)) }), content_type = "application/json") @@ -2361,7 +2361,7 @@ if toastermain.settings.MANAGED: # if we have more than one hit here (for distinct name and version), max the id it out queryset_all_maxids = queryset_all.values('name').distinct().annotate(max_id=Max('id')).values_list('max_id') - queryset_all = queryset_all.filter(id__in = queryset_all_maxids) + queryset_all = queryset_all.filter(id__in = queryset_all_maxids).order_by("name") return HttpResponse(jsonfilter({ "error":"ok", @@ -2374,7 +2374,7 @@ if toastermain.settings.MANAGED: if request.GET['type'] == "machines": queryset_all = Machine.objects.all() if 'project_id' in request.session: - queryset_all = queryset_all.filter(layer_version__in = prj.projectlayer_equivalent_set()) + queryset_all = queryset_all.filter(layer_version__in = prj.projectlayer_equivalent_set()).order_by("name") return HttpResponse(jsonfilter({ "error":"ok", "list" : map ( lambda x: {"id": x.pk, "name": x.name, "detail":"[" + x.layer_version.layer.name+ (" | " + x.layer_version.up_branch.name + "]" if x.layer_version.up_branch is not None else "]")}, |
