From 7f1c7b08227e49172734f09552ceae8bc1f685ad Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 15 Feb 2011 19:31:56 -0600 Subject: Read in optional deps and show in web interface Signed-off-by: Dan McGee --- main/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'main/models.py') diff --git a/main/models.py b/main/models.py index b1813c3..dafbb1e 100644 --- a/main/models.py +++ b/main/models.py @@ -209,7 +209,7 @@ class Package(models.Model): """ deps = [] # TODO: we can use list comprehension and an 'in' query to make this more effective - for dep in self.packagedepend_set.order_by('depname'): + for dep in self.packagedepend_set.order_by('optional', 'depname'): pkgs = Package.objects.select_related('arch', 'repo').filter( pkgname=dep.depname) if not self.arch.agnostic: @@ -320,12 +320,12 @@ class PackageFile(models.Model): class PackageDepend(models.Model): pkg = models.ForeignKey(Package) depname = models.CharField(max_length=255, db_index=True) - depvcmp = models.CharField(max_length=255) + depvcmp = models.CharField(max_length=255, default='') optional = models.BooleanField(default=False) description = models.TextField(null=True, blank=True) def __unicode__(self): - return "%s%s" % (depname, depvcmp) + return "%s%s" % (self.depname, self.depvcmp) class Meta: db_table = 'package_depends' -- cgit v1.2.3-24-g4f1b