diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index 17290bab..463f8f90 100644 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -42,6 +42,7 @@ INSTALLED_APPS = [ 'permissions_tool', 'geelweb.django.navhelper', 'bootstrap_pagination', + 'sortedm2m', # Services - comment out if not used 'services.modules.mumble', diff --git a/hrapplications/admin.py b/hrapplications/admin.py index 4fc0eb85..19fc1d7d 100755 --- a/hrapplications/admin.py +++ b/hrapplications/admin.py @@ -11,8 +11,4 @@ admin.site.register(Application) admin.site.register(ApplicationComment) admin.site.register(ApplicationQuestion) admin.site.register(ApplicationResponse) - - -@admin.register(ApplicationForm) -class ApplicationFormAdmin(admin.ModelAdmin): - filter_horizontal = ['questions'] +admin.site.register(ApplicationForm) \ No newline at end of file diff --git a/hrapplications/migrations/0003_sorted_questions.py b/hrapplications/migrations/0003_sorted_questions.py new file mode 100644 index 00000000..a45a8634 --- /dev/null +++ b/hrapplications/migrations/0003_sorted_questions.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.5 on 2017-03-27 03:29 +from __future__ import unicode_literals + +from django.db import migrations +import sortedm2m.fields +from sortedm2m.operations import AlterSortedManyToManyField + + +class Migration(migrations.Migration): + + dependencies = [ + ('hrapplications', '0002_make_strings_more_stringy'), + ] + + operations = [ + AlterSortedManyToManyField( + model_name='applicationform', + name='questions', + field=sortedm2m.fields.SortedManyToManyField(help_text=None, to='hrapplications.ApplicationQuestion'), + ), + ] diff --git a/hrapplications/models.py b/hrapplications/models.py index 4389c6a8..b21ef771 100755 --- a/hrapplications/models.py +++ b/hrapplications/models.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.utils.encoding import python_2_unicode_compatible from django.db import models from django.contrib.auth.models import User - +from sortedm2m.fields import SortedManyToManyField from eveonline.models import EveCharacter from eveonline.models import EveCorporationInfo @@ -18,7 +18,7 @@ class ApplicationQuestion(models.Model): @python_2_unicode_compatible class ApplicationForm(models.Model): - questions = models.ManyToManyField(ApplicationQuestion) + questions = SortedManyToManyField(ApplicationQuestion) corp = models.OneToOneField(EveCorporationInfo) def __str__(self): diff --git a/requirements.txt b/requirements.txt index 3feefab2..4395133d 100755 --- a/requirements.txt +++ b/requirements.txt @@ -17,6 +17,7 @@ django-navhelper django-bootstrap-pagination django-redis>=4.4 django-registration +django-sortedm2m # awating release for fix to celery/django-celery#447 # django-celery