[copr] master: Rawhide should be formatted differently (6d5c287)

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master commit 6d5c287d32c4bd7e6ddfcc24b95ec2a6f9ed3fb3 Author: Bohuslav Kabrda <bkabrda(a)redhat.com&gt; Date: Tue Jan 22 15:22:19 2013 +0100 Rawhide should be formatted differently coprs_frontend/coprs/filters.py | 8 +++++--- coprs_frontend/coprs/templates/coprs/show.html | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/coprs_frontend/coprs/filters.py b/coprs_frontend/coprs/filters.py index cfcdcfe..b0d689c 100644 --- a/coprs_frontend/coprs/filters.py +++ b/coprs_frontend/coprs/filters.py @@ -13,9 +13,11 @@ def perm_type_from_num(num): # this should probably be stored in DB with the whole mock_chroot... @app.template_filter('os_name_short') -def os_name_short(os_name): +def os_name_short(os_name, os_version): + if os_version == 'rawhide': + return os_version if os_name == 'fedora': - return 'fc' + return 'fc.{0}'.format(os_version) elif os_name == 'epel': - return 'el' + return 'el'.format(os_version) return os_name diff --git a/coprs_frontend/coprs/templates/coprs/show.html b/coprs_frontend/coprs/templates/coprs/show.html index b6f9737..0b98ed1 100644 --- a/coprs_frontend/coprs/templates/coprs/show.html +++ b/coprs_frontend/coprs/templates/coprs/show.html @@ -23,7 +23,7 @@ <p>{{ copr.description_or_not_filled }}</p> <p class="repos"> {% for mock_chroot in copr.mock_chroots %} - {{ mock_chroot.os_release|os_name_short }}{{ mock_chroot.os_version }}.{{ mock_chroot.arch }}{% if not loop.last %}, {% endif %} + {{ mock_chroot.os_release|os_name_short(mock_chroot.os_version) }}.{{ mock_chroot.arch }}{% if not loop.last %}, {% endif %} {% endfor %} </p> </div>