Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 14:30:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sort Completed HR apps by create date (most recent first) (#931)

Browse Source
This commit is contained in:
ghoti 2017-12-20 18:03:51 -05:00 committed by Adarnof
parent 0d64441538
commit 2e214e442c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hrapplications/views.py
View File

@ -39,13 +39,14 @@ def hr_application_management_view(request):
except EveCharacter.DoesNotExist: except EveCharacter.DoesNotExist:
pass pass
if request.user.is_superuser: if request.user.is_superuser:
corp_applications = Application.objects.filter(approved=None) corp_applications = Application.objects.filter(approved=None).order_by('-created')
finished_corp_applications = Application.objects.exclude(approved=None) finished_corp_applications = Application.objects.exclude(approved=None).order_by('-created')
elif request.user.has_perm('auth.human_resources') and main_char: elif request.user.has_perm('auth.human_resources') and main_char:
if ApplicationForm.objects.filter(corp__corporation_id=main_char.corporation_id).exists(): if ApplicationForm.objects.filter(corp__corporation_id=main_char.corporation_id).exists():
app_form = ApplicationForm.objects.get(corp__corporation_id=main_char.corporation_id) app_form = ApplicationForm.objects.get(corp__corporation_id=main_char.corporation_id)
corp_applications = Application.objects.filter(form=app_form).filter(approved=None) corp_applications = Application.objects.filter(form=app_form).filter(approved=None).sorted_by('-created')
finished_corp_applications = Application.objects.filter(form=app_form).filter(approved__in=[True, False]) finished_corp_applications = Application.objects.filter(form=app_form).filter(
approved__in=[True, False]).order_by('-created')
logger.debug("Retrieved %s personal, %s corp applications for %s" % ( logger.debug("Retrieved %s personal, %s corp applications for %s" % (
len(request.user.applications.all()), len(corp_applications), request.user)) len(request.user.applications.all()), len(corp_applications), request.user))
context = { context = {