Expand admin controls and fix a small issue

This commit is contained in:
2011-05-26 10:43:05 +01:00
parent ab86e0a550
commit 70ce707815
3 changed files with 11 additions and 5 deletions

View File

@@ -1,6 +1,4 @@
from django.contrib import admin 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 from hr.models import Application, Recommendation, Audit, Blacklist, BlacklistSource, ApplicationConfig
class ApplicationAdmin(admin.ModelAdmin): class ApplicationAdmin(admin.ModelAdmin):
@@ -42,5 +40,8 @@ class BlacklistSourceAdmin(admin.ModelAdmin):
admin.site.register(BlacklistSource, BlacklistSourceAdmin) 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)

View File

@@ -167,4 +167,9 @@ class ApplicationConfig(models.Model):
help_text="This allows HR staff to see the applicant's API keys") help_text="This allows HR staff to see the applicant's API keys")
def __unicode__(self): 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']

View File

@@ -124,7 +124,7 @@ def add_application(request):
else: else:
form = clsform() # An unbound form 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)) return render_to_response('hr/applications/add.html', locals(), context_instance=RequestContext(request))
else: else:
return render_to_response('hr/applications/noadd.html', locals(), context_instance=RequestContext(request)) return render_to_response('hr/applications/noadd.html', locals(), context_instance=RequestContext(request))