We are currently solving the following issue within our repository. Here is the issue text:
--- BEGIN ISSUE ---
Order of poll answer choices mixed up after saving
The order of poll answer choices is mixed up after saving. Restoring original order is not possible:
![bildschirmfoto 2017-05-12 um 17 11 59](https://cloud.githubusercontent.com/assets/11075214/26004427/226d3d8c-3736-11e7-8759-ccf91a1e1da8.png)


--- END ISSUE ---

Below are some code segments, each from a relevant file. One or more of these files may contain bugs.
--- BEGIN FILES ---
Path: `apps/polls/models.py`
Content:
```
1 from django.contrib.contenttypes.fields import GenericRelation
2 from django.db import models
3 
4 from adhocracy4.comments import models as comment_models
5 from adhocracy4.models.base import UserGeneratedContentModel
6 from adhocracy4.modules import models as module_models
7 
8 from . import validators
9 
10 
11 class Poll(module_models.Item):
12     comments = GenericRelation(comment_models.Comment,
13                                related_query_name='poll',
14                                object_id_field='object_pk')
15 
16 
17 class Question(models.Model):
18     label = models.CharField(max_length=255)
19     weight = models.SmallIntegerField()
20 
21     poll = models.ForeignKey(
22         'Poll',
23         on_delete=models.CASCADE,
24         related_name='questions'
25     )
26 
27     def user_choices_list(self, user):
28         if not user.is_authenticated():
29             return []
30 
31         return self.choices\
32             .filter(votes__creator=user)\
33             .values_list('id', flat=True)
34 
35     def __str__(self):
36         return self.label
37 
38     class Meta:
39         ordering = ['weight']
40 
41 
42 class ChoiceQuerySet(models.QuerySet):
43 
44     def annotate_vote_count(self):
45         return self.annotate(
46             vote_count=models.Count(
47                 'votes'
48             )
49         )
50 
51 
52 class Choice(models.Model):
53     label = models.CharField(max_length=255)
54 
55     question = models.ForeignKey(
56         'Question',
57         on_delete=models.CASCADE,
58         related_name='choices',
59     )
60 
61     objects = ChoiceQuerySet.as_manager()
62 
63     def __str__(self):
64         return '%s @%s' % (self.label, self.question)
65 
66 
67 class Vote(UserGeneratedContentModel):
68     choice = models.ForeignKey(
69         'Choice',
70         on_delete=models.CASCADE,
71         related_name='votes'
72     )
73 
74     def validate_unique(self, exclude=None):
75         super(Vote, self).validate_unique(exclude)
76         validators.single_vote_per_user(self.creator,
77                                         self.choice.question,
78                                         self.pk)
79 
80     # Make Vote instances behave like items for rule checking
81     @property
82     def module(self):
83         self.choice.question.poll.module
84 
85     @property
86     def project(self):
87         return self.module.project
88 
89     def __str__(self):
90         return '%s: %s' % (self.creator, self.choice)
91
```
--- END FILES ---

Please first localize the bug based on the issue statement, and then generate a patch according to the `git diff` format fenced by three backticks.

Here is an example:

```diff
diff --git a/examples/server_async.py b/examples/server_async.py
--- a/examples/server_async.py
+++ b/examples/server_async.py
@@ -313,4 +313,4 @@
 
 
 if __name__ == "__main__":
-    asyncio.run(run_async_server("."), debug=True)
+    asyncio.run(run_async_server(), debug=True)
diff --git a/examples/server_sync.py b/examples/server_sync.py
--- a/examples/server_sync.py
+++ b/examples/server_sync.py
@@ -313,5 +313,5 @@
 
 
 if __name__ == "__main__":
-    server = run_sync_server(".")
+    server = run_sync_server()
     server.shutdown()

```

diff --git a/apps/polls/models.py b/apps/polls/models.py
--- a/apps/polls/models.py
+++ b/apps/polls/models.py
@@ -60,6 +60,9 @@
 
     objects = ChoiceQuerySet.as_manager()
 
+    class Meta:
+        ordering = ['id']
+
     def __str__(self):
         return '%s @%s' % (self.label, self.question)

{"golden_diff": "diff --git a/apps/polls/models.py b/apps/polls/models.py\n--- a/apps/polls/models.py\n+++ b/apps/polls/models.py\n@@ -60,6 +60,9 @@\n \n     objects = ChoiceQuerySet.as_manager()\n \n+    class Meta:\n+        ordering = ['id']\n+\n     def __str__(self):\n         return '%s @%s' % (self.label, self.question)\n", "issue": "Order of poll answer choices mixed up after saving\nThe order of poll answer choices is mixed up after saving. Restoring original order is not possible:\r\n![bildschirmfoto 2017-05-12 um 17 11 59](https://cloud.githubusercontent.com/assets/11075214/26004427/226d3d8c-3736-11e7-8759-ccf91a1e1da8.png)\r\n\n", "before_files": [{"content": "from django.contrib.contenttypes.fields import GenericRelation\nfrom django.db import models\n\nfrom adhocracy4.comments import models as comment_models\nfrom adhocracy4.models.base import UserGeneratedContentModel\nfrom adhocracy4.modules import models as module_models\n\nfrom . import validators\n\n\nclass Poll(module_models.Item):\n    comments = GenericRelation(comment_models.Comment,\n                               related_query_name='poll',\n                               object_id_field='object_pk')\n\n\nclass Question(models.Model):\n    label = models.CharField(max_length=255)\n    weight = models.SmallIntegerField()\n\n    poll = models.ForeignKey(\n        'Poll',\n        on_delete=models.CASCADE,\n        related_name='questions'\n    )\n\n    def user_choices_list(self, user):\n        if not user.is_authenticated():\n            return []\n\n        return self.choices\\\n            .filter(votes__creator=user)\\\n            .values_list('id', flat=True)\n\n    def __str__(self):\n        return self.label\n\n    class Meta:\n        ordering = ['weight']\n\n\nclass ChoiceQuerySet(models.QuerySet):\n\n    def annotate_vote_count(self):\n        return self.annotate(\n            vote_count=models.Count(\n                'votes'\n            )\n        )\n\n\nclass Choice(models.Model):\n    label = models.CharField(max_length=255)\n\n    question = models.ForeignKey(\n        'Question',\n        on_delete=models.CASCADE,\n        related_name='choices',\n    )\n\n    objects = ChoiceQuerySet.as_manager()\n\n    def __str__(self):\n        return '%s @%s' % (self.label, self.question)\n\n\nclass Vote(UserGeneratedContentModel):\n    choice = models.ForeignKey(\n        'Choice',\n        on_delete=models.CASCADE,\n        related_name='votes'\n    )\n\n    def validate_unique(self, exclude=None):\n        super(Vote, self).validate_unique(exclude)\n        validators.single_vote_per_user(self.creator,\n                                        self.choice.question,\n                                        self.pk)\n\n    # Make Vote instances behave like items for rule checking\n    @property\n    def module(self):\n        self.choice.question.poll.module\n\n    @property\n    def project(self):\n        return self.module.project\n\n    def __str__(self):\n        return '%s: %s' % (self.creator, self.choice)\n", "path": "apps/polls/models.py"}], "after_files": [{"content": "from django.contrib.contenttypes.fields import GenericRelation\nfrom django.db import models\n\nfrom adhocracy4.comments import models as comment_models\nfrom adhocracy4.models.base import UserGeneratedContentModel\nfrom adhocracy4.modules import models as module_models\n\nfrom . import validators\n\n\nclass Poll(module_models.Item):\n    comments = GenericRelation(comment_models.Comment,\n                               related_query_name='poll',\n                               object_id_field='object_pk')\n\n\nclass Question(models.Model):\n    label = models.CharField(max_length=255)\n    weight = models.SmallIntegerField()\n\n    poll = models.ForeignKey(\n        'Poll',\n        on_delete=models.CASCADE,\n        related_name='questions'\n    )\n\n    def user_choices_list(self, user):\n        if not user.is_authenticated():\n            return []\n\n        return self.choices\\\n            .filter(votes__creator=user)\\\n            .values_list('id', flat=True)\n\n    def __str__(self):\n        return self.label\n\n    class Meta:\n        ordering = ['weight']\n\n\nclass ChoiceQuerySet(models.QuerySet):\n\n    def annotate_vote_count(self):\n        return self.annotate(\n            vote_count=models.Count(\n                'votes'\n            )\n        )\n\n\nclass Choice(models.Model):\n    label = models.CharField(max_length=255)\n\n    question = models.ForeignKey(\n        'Question',\n        on_delete=models.CASCADE,\n        related_name='choices',\n    )\n\n    objects = ChoiceQuerySet.as_manager()\n\n    class Meta:\n        ordering = ['id']\n\n    def __str__(self):\n        return '%s @%s' % (self.label, self.question)\n\n\nclass Vote(UserGeneratedContentModel):\n    choice = models.ForeignKey(\n        'Choice',\n        on_delete=models.CASCADE,\n        related_name='votes'\n    )\n\n    def validate_unique(self, exclude=None):\n        super(Vote, self).validate_unique(exclude)\n        validators.single_vote_per_user(self.creator,\n                                        self.choice.question,\n                                        self.pk)\n\n    # Make Vote instances behave like items for rule checking\n    @property\n    def module(self):\n        self.choice.question.poll.module\n\n    @property\n    def project(self):\n        return self.module.project\n\n    def __str__(self):\n        return '%s: %s' % (self.creator, self.choice)\n", "path": "apps/polls/models.py"}]}