Kill a no longer necessary hack in the admin

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 1 insertions, 15 deletions

diff --git a/main/admin.py b/main/admin.py
index cd1ffda7..0ca2c38d 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -63,7 +63,7 @@ class MirrorAdmin(admin.ModelAdmin):
     ]
 
 class PackageAdmin(admin.ModelAdmin):
-    list_display = ('pkgname', '_reponame', '_archname', '_maintainername')
+    list_display = ('pkgname', 'repo', 'arch', 'maintainer')
     list_filter = ('repo', 'arch', 'maintainer')
     ordering = ['pkgname']
     search_fields = ('pkgname',)
diff --git a/main/models.py b/main/models.py
index 9e572cee..336f0ecf 100644
--- a/main/models.py
+++ b/main/models.py
@@ -182,20 +182,6 @@ class Package(models.Model):
     def __unicode__(self):
         return self.pkgname
 
-    # According to http://code.djangoproject.com/ticket/2583 we have "bad data"
-    # The problem is the queries constructed by the admin  to retrieve foreign
-    # keys are empty. This allows us to display items in the list but kills
-    # sorting
-    def _reponame(self):
-        return self.repo.name
-    _reponame.short_description='Repo'
-    def _archname(self):
-        return self.arch.name
-    _archname.short_description='Arch'
-    def _maintainername(self):
-        return self.maintainer.username
-    _maintainername.short_description = 'Maintainer'
-
     def get_absolute_url(self):
         return '/packages/%s/%s/%s/' % (self.repo.name.lower(),
                 self.arch.name, self.pkgname)