diff options
| -rw-r--r-- | main/models.py | 11 | ||||
| -rw-r--r-- | templates/packages/details.html | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/main/models.py b/main/models.py index d4250f3..fb548e9 100644 --- a/main/models.py +++ b/main/models.py @@ -194,20 +194,17 @@ class Package(models.Model): def get_requiredby(self): """ - Returns a list of tuples(2). - - Each tuple in the list is as follows: (packageid, packagename) + Returns a list of package objects. """ reqs = [] requiredby = PackageDepend.objects.filter(depname=self.pkgname).filter( - Q(pkg__arch=self.arch) | Q(pkg__arch__name__iexact='any') - ).order_by('depname') + Q(pkg__arch=self.arch) | Q(pkg__arch__name__iexact='any')) for req in requiredby: - reqs.append((req.pkg.id,req.pkg.pkgname)) + reqs.append(req.pkg) ## sort the resultant list. Django has problems in the orm with ## trying to shoehorn the sorting into the reverse foreign key ## reference in the query above. :( - reqs.sort(lambda a,b: cmp(a[1],b[1])) + reqs.sort(lambda a,b: cmp(a.pkgname,b.pkgname)) return reqs def get_depends(self): diff --git a/templates/packages/details.html b/templates/packages/details.html index facb697..7e8c7d3 100644 --- a/templates/packages/details.html +++ b/templates/packages/details.html @@ -70,7 +70,7 @@ <h4>Required By:</h4> <ul style="font-size:small;list-style:none"> {% for req in pkg.get_requiredby %} - <li><a href="/packages/{{ req.0 }}/">{{ req.1 }}</a></li> + <li><a href="/packages/{{ req.id }}/">{{ req.pkgname }}{% ifequal req.repo.name "Testing" %}(testing){% endifequal %}{% ifequal req.repo.name "Unstable" %}(unstable){% endifequal %}</a></li> {% endfor %} </ul> </div> |