Repository :
http://git.fedorahosted.org/cgit/copr.git
On branch : master
---------------------------------------------------------------
commit 426f22711d4653e145c0dfff4f37c01935f77501
Author: Bohuslav Kabrda <bkabrda(a)redhat.com>
Date: Thu Jan 31 11:49:54 2013 +0100
Fix listing coprs by manage.py
---------------------------------------------------------------
coprs_frontend/coprs/filters.py | 14 ++++++++------
coprs_frontend/coprs/logic/coprs_logic.py | 1 +
coprs_frontend/coprs/models.py | 8 +++++++-
coprs_frontend/manage.py | 2 +-
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/coprs_frontend/coprs/filters.py b/coprs_frontend/coprs/filters.py
index 98d97dc..5cbdb75 100644
--- a/coprs_frontend/coprs/filters.py
+++ b/coprs_frontend/coprs/filters.py
@@ -14,10 +14,12 @@ 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, os_version):
- if os_version == 'rawhide':
- return os_version
- if os_name == 'fedora':
- return 'fc.{0}'.format(os_version)
- elif os_name == 'epel':
- return 'el{0}'.format(os_version)
+ # TODO: make it models.MockChroot method or not?
+ if os_version:
+ if os_version == 'rawhide':
+ return os_version
+ if os_name == 'fedora':
+ return 'fc.{0}'.format(os_version)
+ elif os_name == 'epel':
+ return 'el{0}'.format(os_version)
return os_name
diff --git a/coprs_frontend/coprs/logic/coprs_logic.py
b/coprs_frontend/coprs/logic/coprs_logic.py
index 3403c04..21b2b00 100644
--- a/coprs_frontend/coprs/logic/coprs_logic.py
+++ b/coprs_frontend/coprs/logic/coprs_logic.py
@@ -173,6 +173,7 @@ class MockChrootsLogic(object):
query = models.MockChroot.query
if active_only:
query = query.filter(models.MockChroot.is_active==True)
+ return query
@classmethod
def add(cls, user, name):
diff --git a/coprs_frontend/coprs/models.py b/coprs_frontend/coprs/models.py
index b59e7fa..cfa6857 100644
--- a/coprs_frontend/coprs/models.py
+++ b/coprs_frontend/coprs/models.py
@@ -191,7 +191,13 @@ class MockChroot(db.Model, Serializer):
@property
def chroot_name(self):
- return '{0}-{1}-{2}'.format(self.os_release, self.os_version, self.arch)
+ if self.os_version:
+ format_string = '{rel}-{ver}-{arch}'
+ else:
+ format_string = '{rel}-{arch}'
+ return format_string.format(rel=self.os_release,
+ ver=self.os_version,
+ arch=self.arch)
class CoprChroot(db.Model, Serializer):
mock_chroot_id = db.Column(db.Integer, db.ForeignKey('mock_chroot.id'),
primary_key = True)
diff --git a/coprs_frontend/manage.py b/coprs_frontend/manage.py
index 5c505be..e191d52 100755
--- a/coprs_frontend/manage.py
+++ b/coprs_frontend/manage.py
@@ -112,7 +112,7 @@ class DropChrootCommand(ChrootCommand):
class DisplayChrootsCommand(Command):
'Displays current mock chroots'
def run(self, active_only):
- for ch in coprs_logic.MockChrootsLogic.get_multiple(active_only=active_only):
+ for ch in coprs_logic.MockChrootsLogic.get_multiple(None,
active_only=active_only).all():
print ch.chroot_name
option_list = (