summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/toastergui/views.py
diff options
context:
space:
mode:
authorBelen Barros Pena <belen.barros.pena@linux.intel.com>2014-11-27 12:18:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-28 14:03:00 +0000
commitfee87cdd57369352047b33aafef2a2a7b403b06b (patch)
tree2e987f6e77849ee85b6d7587d4158cfa3b2c6329 /bitbake/lib/toaster/toastergui/views.py
parentaf51fb06740768a85f4840ff2f93ef0c73f46877 (diff)
downloadpoky-fee87cdd57369352047b33aafef2a2a7b403b06b.tar.gz
bitbake: toaster: release name consistency
Small changes to the project, new project and all layers pages to ensure consitency in release naming across the interface. The changes are: * In the new project page, change the label 'release version' to 'release' * In the new project page, sort the releases in the dropdown menu in ascending alphabetical order * In the new project page, remove the release name that was showing between brackets after the release description in the dropdown menu * In the project page, make sure the release information shows the release description field instead of the release name, to keep consistency with the new project page * In the all layers page, provide some help text for the branch 'HEAD' (Bitbake rev: 9a90bf201dab83060f0bdd6ac08c72b8d62f6060) Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/views.py')
-rwxr-xr-xbitbake/lib/toaster/toastergui/views.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py
index 49a7769cdb..8301f6ce66 100755
--- a/bitbake/lib/toaster/toastergui/views.py
+++ b/bitbake/lib/toaster/toastergui/views.py
@@ -1893,7 +1893,7 @@ if toastermain.settings.MANAGED:
1893 context = { 1893 context = {
1894 'email': request.user.email if request.user.is_authenticated() else '', 1894 'email': request.user.email if request.user.is_authenticated() else '',
1895 'username': request.user.username if request.user.is_authenticated() else '', 1895 'username': request.user.username if request.user.is_authenticated() else '',
1896 'releases': Release.objects.order_by("id"), 1896 'releases': Release.objects.order_by("description"),
1897 } 1897 }
1898 1898
1899 try: 1899 try:
@@ -2016,7 +2016,7 @@ if toastermain.settings.MANAGED:
2016 prj.projectlayer_set.all().order_by("id")), 2016 prj.projectlayer_set.all().order_by("id")),
2017 "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()), 2017 "targets" : map(lambda x: {"target" : x.target, "task" : x.task, "pk": x.pk}, prj.projecttarget_set.all()),
2018 "freqtargets": freqtargets, 2018 "freqtargets": freqtargets,
2019 "releases": map(lambda x: {"id": x.pk, "name": x.name}, Release.objects.all()), 2019 "releases": map(lambda x: {"id": x.pk, "name": x.name, "description":x.description}, Release.objects.all()),
2020 } 2020 }
2021 try: 2021 try:
2022 context["machine"] = {"name": prj.projectvariable_set.get(name="MACHINE").value} 2022 context["machine"] = {"name": prj.projectvariable_set.get(name="MACHINE").value}