Shorten and shrink version identifier
parent
361eeeac54
commit
d367cfe135
|
@ -558,6 +558,10 @@ p.build-missing { font-size: .8em; color: #9d9a55; margin: 0 0 3px; }
|
|||
font-size: 16px;
|
||||
}
|
||||
|
||||
div.project-version-list span.version-branch {
|
||||
font-size: .9em;
|
||||
}
|
||||
|
||||
/* Form Wizards */
|
||||
div.actions.wizard-actions button.action-primary,
|
||||
div.actions.wizard-actions input.action-primary {
|
||||
|
|
|
@ -84,6 +84,14 @@ class Version(models.Model):
|
|||
else:
|
||||
return self.slug
|
||||
|
||||
@property
|
||||
def identifier_friendly(self):
|
||||
'''Return display friendly identifier'''
|
||||
re_sha = re.compile(r'^[0-9a-f]{40}$', re.I)
|
||||
if re_sha.match(str(self.identifier)):
|
||||
return self.identifier[:6]
|
||||
return self.identifier
|
||||
|
||||
def get_subdomain_url(self):
|
||||
use_subdomain = getattr(settings, 'USE_SUBDOMAIN', False)
|
||||
if use_subdomain:
|
||||
|
|
|
@ -42,7 +42,7 @@ Versions
|
|||
{{ version.get_privacy_level_display }}
|
||||
</span>
|
||||
{% if not version.slug in version.identifier %}
|
||||
<span class="right-menu quiet version-branch">{{ version.identifier }}</span>
|
||||
<span class="right-menu quiet version-branch">{{ version.identifier_friendly|truncatechars:24 }}</span>
|
||||
{% endif %}
|
||||
{% if request.user|is_admin:project %}
|
||||
<ul class="module-item-menu">
|
||||
|
@ -74,8 +74,8 @@ Versions
|
|||
<span class="right-menu">
|
||||
{{ version.get_privacy_level_display }}
|
||||
</span>
|
||||
{% if not version.slug in version.identifier %}
|
||||
<span class="right-menu quiet version-branch">{{ version.identifier|truncatechars:24 }}</span>
|
||||
{% if not version.slug in version.identifier_friendly %}
|
||||
<span class="right-menu quiet version-branch">{{ version.identifier_friendly|truncatechars:24 }}</span>
|
||||
{% endif %}
|
||||
{% if request.user|is_admin:project %}
|
||||
<ul class="module-item-menu">
|
||||
|
|
Loading…
Reference in New Issue