From 70ce707815c65bb72c436d415bcd09aedd6fd4b2 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Thu, 26 May 2011 10:43:05 +0100
Subject: [PATCH] Expand admin controls and fix a small issue

---
 app/hr/admin.py  | 7 ++++---
 app/hr/models.py | 7 ++++++-
 app/hr/views.py  | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/hr/admin.py b/app/hr/admin.py
index 72ba96d..38d5f6a 100644
--- a/app/hr/admin.py
+++ b/app/hr/admin.py
@@ -1,6 +1,4 @@
 from django.contrib import admin
-from django.contrib.auth.models import User
-from django.contrib.auth.admin import UserAdmin
 from hr.models import Application, Recommendation, Audit, Blacklist, BlacklistSource, ApplicationConfig
 
 class ApplicationAdmin(admin.ModelAdmin):
@@ -42,5 +40,8 @@ class BlacklistSourceAdmin(admin.ModelAdmin):
 
 admin.site.register(BlacklistSource, BlacklistSourceAdmin)
 
+class ApplicationConfigAdmin(admin.ModelAdmin):
+    list_display = ('corporation', 'is_accepting', 'api_required', 'api_view')
+
+admin.site.register(ApplicationConfig, ApplicationConfigAdmin)
 
-admin.site.register(admin.ModelAdmin, ApplicationConfig)
diff --git a/app/hr/models.py b/app/hr/models.py
index 6488f69..5e120b8 100644
--- a/app/hr/models.py
+++ b/app/hr/models.py
@@ -167,4 +167,9 @@ class ApplicationConfig(models.Model):
                                        help_text="This allows HR staff to see the applicant's API keys")
 
     def __unicode__(self):
-        return u'%s' % corporation
+        return u'%s' % self.corporation
+
+    class Meta:
+        verbose_name = 'Application Config'
+        verbose_name_plural = 'Application Configs'
+        ordering = ['corporation']
diff --git a/app/hr/views.py b/app/hr/views.py
index a03c47c..4c866bb 100644
--- a/app/hr/views.py
+++ b/app/hr/views.py
@@ -124,7 +124,7 @@ def add_application(request):
     else:
         form = clsform() # An unbound form
 
-    if len(EVEPlayerCorporation.objects.filter(applications=True)):
+    if len(EVEPlayerCorporation.objects.filter(application_config__is_accepting=True)):
         return render_to_response('hr/applications/add.html', locals(), context_instance=RequestContext(request))
     else:
         return render_to_response('hr/applications/noadd.html', locals(), context_instance=RequestContext(request))