Anpassungen des Codes an Django 1.11 mit Python 3

Grapelli wurde entfernt, das neue Django Admin ist hübsch genug.

src/mahjong_ranking/forms.py

@@ -24,10 +24,10 @@ class HanchanForm(forms.ModelForm):
     class Meta(object):
         model = models.Hanchan
         fields = ('start',
-                  'player1', 'player1_input_score', # 'player1_comment',
-                  'player2', 'player2_input_score', # 'player2_comment',
-                  'player3', 'player3_input_score', # 'player3_comment',
-                  'player4', 'player4_input_score', # 'player4_comment',
+                  'player1', 'player1_input_score',
+                  'player2', 'player2_input_score',
+                  'player3', 'player3_input_score',
+                  'player4', 'player4_input_score',
                   'comment')
         widgets = {'event': forms.HiddenInput(),
                    'comment': forms.widgets.Textarea(attrs={'rows': 4, 'cols': 40})
@@ -35,11 +35,14 @@ class HanchanForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super(HanchanForm, self).__init__(*args, **kwargs)
-        # self.fields['event'].widget.attrs['disabled'] = True
-        for i in xrange(1, 4):
+        player_queryset = USER_MODEL.objects.filter(is_active=True,
+                                                    membership=True)
+        for i in range(1, 4):
+            player = 'player%d' % i
             player_input_score = 'player%d_input_score' % i
             self.fields[player_input_score].widget.attrs['size'] = 6
             self.fields[player_input_score].widget.attrs['type'] = 'number'
+            self.fields[player].queryset = player_queryset