diff options
| author | Dave Lerner <dave.lerner@windriver.com> | 2015-02-25 14:53:22 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-09 14:33:50 +0000 |
| commit | d8ae3ac160a0256f205908fb3f72a2a1a2a85c94 (patch) | |
| tree | c498813419df24dc60beeec37582540ae926f575 /bitbake | |
| parent | 4004aebb1b505967410494ed152b44eab0bf6cb4 (diff) | |
| download | ast2050-yocto-poky-d8ae3ac160a0256f205908fb3f72a2a1a2a85c94.zip ast2050-yocto-poky-d8ae3ac160a0256f205908fb3f72a2a1a2a85c94.tar.gz | |
bitbake: toaster: commit id format on layers page
On the layers page, when a layer revision is a commit id instead of a
an upstream branch name, then follow the same format for displaying the
commit id as on the recipes page. That format is a button with the
truncated commit SHAID which when pressed expands to the full SHAID.
[YOCTO #7191]
(Bitbake rev: 507d2a36e53ba2c1f49616d52e4700f6c1bca8fd)
Signed-off-by: Dave Lerner <dave.lerner@windriver.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/layers.html | 15 | ||||
| -rw-r--r-- | bitbake/lib/toaster/toastergui/templatetags/projecttags.py | 12 |
2 files changed, 21 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/layers.html b/bitbake/lib/toaster/toastergui/templates/layers.html index 864e156..c35a299 100644 --- a/bitbake/lib/toaster/toastergui/templates/layers.html +++ b/bitbake/lib/toaster/toastergui/templates/layers.html @@ -52,12 +52,15 @@ {% endif %} </td> <td class="branch"> - {% if o.branch %} - {{o.branch}} - {% else %} - {{o.up_branch.name}} - <i class="icon-question-sign get-help hover-help" title="Your builds will use the tip of the branch you have cloned or downloaded to your computer, so nothing will be fetched"></i> - {% endif %} + {% with vcs_ref=o.get_vcs_reference %} + {% if vcs_ref|is_shaid %} + <a class="btn" data-content="<ul class='unstyled'> <li>{{vcs_ref}}</li> </ul>"> + {{vcs_ref|truncatechars:10}} + </a> + {% else %} + {{vcs_ref}} + {% endif %} + {% endwith %} </td> <td class="dependencies"> {% with ods=o.dependencies.all%} diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py index 276c6eb..e66910c 100644 --- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py +++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py @@ -295,3 +295,15 @@ def format_build_date(completed_on): if delta.days >= 1: return True + +@register.filter +def is_shaid(text): + """ return True if text length is 40 characters and all hex-digits + """ + try: + int(text, 16) + if len(text) == 40: + return True + return False + except ValueError: + return False |
