[bitbake-devel] [PATCH 10/27] toastergui: set column heading to 'Revision'

Alex DAMIAN alexandru.damian at intel.com
Mon Feb 9 18:01:40 UTC 2015


From: Belen Barros Pena <belen.barros.pena at intel.com>

Replace the column heading 'Branch, tag or commit' with
'Revision'. This also fixes 7023.

[YOCTO #7023]

Signed-off-by: Belen Barros Pena <belen.barros.pena at intel.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>
---
 lib/toaster/toastergui/templates/layerdetails.html |  5 ++++-
 lib/toaster/toastergui/views.py                    | 10 ++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/toaster/toastergui/templates/layerdetails.html b/lib/toaster/toastergui/templates/layerdetails.html
index 4ffd071..6705215 100644
--- a/lib/toaster/toastergui/templates/layerdetails.html
+++ b/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/lib/toaster/toastergui/views.py b/lib/toaster/toastergui/views.py
index 4b770ff..9567e62 100755
--- a/lib/toaster/toastergui/views.py
+++ b/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',
-- 
1.9.1




More information about the bitbake-devel mailing list