Fix some issues in the code.

biscuit/core/forms.py

@@ -63,13 +63,13 @@ class EditPersonForm(forms.ModelForm):
 
                 self.cleaned_data['user'] = new_user_obj
 
-class EditGroupForm(forms.ModelForm):
-    members = forms.MultipleChoiceField(
-        choices=[(person.id, person.__str__) for person in Person.objects.all()])
-
-    owners = forms.MultipleChoiceField(
-        choices=[(person.id, person.__str__) for person in Person.objects.all()])
 
+class EditGroupForm(forms.ModelForm):
     class Meta:
         model = Group
         fields = ['name', 'short_name', 'members', 'owners']
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['members'].queryset = Person.objects.all()
+        self.fields['owners'].queryset = Person.objects.all()

biscuit/core/templates/core/edit_group.html

 {% extends "core/base.html" %}
 {% load bootstrap4 i18n %}
 
-{% block page_title %}{% blocktrans %}Edit Group{% endblocktrans %}{% endblock %}
+{% block page_title %}{% blocktrans %}Edit group{% endblocktrans %}{% endblock %}
 
 {% block content %}
 
- <form method="post" enctype="multipart/form-data">
+ <form method="post">
   {% csrf_token %}
   {% bootstrap_form edit_group_form %}
   <input type="submit" value="Edit" />

biscuit/core/views.py

@@ -8,7 +8,7 @@ from django_tables2 import RequestConfig
 from django.utils.translation import ugettext_lazy as _
 
 from .decorators import admin_required
-from .forms import PersonsAccountsFormSet, EditPersonForm
+from .forms import PersonsAccountsFormSet, EditPersonForm, EditGroupForm
 from .models import Person, Group
 from .tables import PersonsTable, GroupsTable
 from .util import messages
@@ -170,9 +170,8 @@ def edit_group(request: HttpRequest, id_: int) -> HttpResponse:
 
     group = get_object_or_404(Group, id=id_)
 
-    edit_group_form = EditPersonForm(request.POST or None, instance=group)
+    edit_group_form = EditGroupForm(request.POST or None, instance=group)
 
-    context['group'] = group
 
     if request.method == 'POST':
         if edit_group_form.is_valid():
@@ -181,6 +180,7 @@ def edit_group(request: HttpRequest, id_: int) -> HttpResponse:
             messages.success(request, _('The group has been saved.'))
             return redirect('groups')
 
+    context['group'] = group
     context['edit_group_form'] = edit_group_form
 
     return render(request, 'core/edit_group.html', context)