diff options
| author | Belen Barros Pena <belen.barros.pena@intel.com> | 2015-02-04 13:10:07 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-10 23:07:48 +0000 |
| commit | 42a7d91ad4bc30c31b5467ce9ec83b7390bd2329 (patch) | |
| tree | 0168c43424f41b24e51c367f9ea5010eb48d2104 /bitbake | |
| parent | d81e5141c10a97bf5764892f9b20933b751c1da3 (diff) | |
| download | ast2050-yocto-poky-42a7d91ad4bc30c31b5467ce9ec83b7390bd2329.zip ast2050-yocto-poky-42a7d91ad4bc30c31b5467ce9ec83b7390bd2329.tar.gz | |
bitbake: toastergui: set column heading to 'Revision'
Replace the column heading 'Branch, tag or commit' with
'Revision'. This also fixes 7023.
[YOCTO #7023]
(Bitbake rev: 102144f8e5069f76e7de8db052c3c4531609771f)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templates/layerdetails.html | 5 | ||||
| -rwxr-xr-x | bitbake/lib/toaster/toastergui/views.py | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index 4ffd071..6705215 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html @@ -142,7 +142,10 @@ <i id="change-subdir" class="icon-pencil"></i> <span class="icon-trash delete-current-value" data-toggle="tooltip" title="Delete"></span> </dd> - <dt>Brach, tag or commit</dt> + <dt> + <i class="icon-question-sign get-help" title="The Git branch, tag or commit"></i> + Revision + </dt> <dd> <span class="current-value">{{layerversion.commit}}</span> <form style="display:none;"> diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 4b770ff..9567e62 100755 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py @@ -2574,9 +2574,9 @@ if toastermain.settings.MANAGED: 'hidden': 1, 'qhelp': "The layer directory within the Git repository", }, - { 'name': 'Branch, tag o commit', + { 'name': 'Revision', 'clclass': 'branch', - 'qhelp': "The Git branch of the layer. For the layers from the OpenEmbedded source, the branch matches the Yocto Project version you selected for this project", + 'qhelp': "The Git branch, tag or commit. For the layers from the OpenEmbedded layer source, the revision is always the branch compatible with the Yocto Project version you selected for this project", }, { 'name': 'Dependencies', 'clclass': 'dependencies', @@ -2740,8 +2740,9 @@ if toastermain.settings.MANAGED: 'options': map(lambda x: ("Targets provided by " + x.name + " layers", 'layer_source__pk:' + str(x.id), queryset_with_search.filter(layer_source__pk = x.id).count() ), LayerSource.objects.all()), } }, - { 'name': 'Branch, tag or commit', + { 'name': 'Revision', 'clclass': 'branch', + 'qhelp': "The Git branch, tag or commit. For the layers from the OpenEmbedded layer source, the revision is always the branch compatible with the Yocto Project version you selected for this project.", 'hidden': 1, }, ] @@ -2827,8 +2828,9 @@ if toastermain.settings.MANAGED: 'options': map(lambda x: (x.name, 'layer_source__pk:' + str(x.id), queryset_with_search.filter(layer_source__pk = x.id).count() ), LayerSource.objects.all()), } }, - { 'name': 'Branch, tag or commit', + { 'name': 'Revision', 'clclass': 'branch', + 'qhelp' : "The Git branch, tag or commit. For the layers from the OpenEmbedded layer source, the revision is always the branch compatible with the Yocto Project version you selected for this project", 'hidden': 1, }, { 'name': 'Select', |
