prompt: You will be provided with a partial code base and an issue statement explaining a problem to resolve.
  <issue>
  django-admin: place comment's is_blocked next to is_censored
  **URL:** 
  **user:** 
  **expected behaviour:** As is_removed, is_censored and is_blocked have a very similar behaviour, the is_blocked field should be next to the first two fields. In the detail as well as in the list view
  **behaviour:** 
  **important screensize:**
  **device & browser:** 
  **Comment/Question:** 
  
  Screenshot?
  ![Screenshot from 2021-11-12 11-20-55](https://user-images.githubusercontent.com/8178179/141452772-f03df35f-b6e4-45d6-8703-c587ff0baef5.png)
  ![Screenshot from 2021-11-12 11-20-37](https://user-images.githubusercontent.com/8178179/141452773-c511dc84-3c92-49e4-abe8-dbb8022794be.png)
  
  
  
  </issue>
  <code>
  [start of adhocracy4/comments/admin.py]
  1 from django.contrib import admin
  2 
  3 from .models import Comment
  4 
  5 
  6 @admin.register(Comment)
  7 class CommentAdmin(admin.ModelAdmin):
  8     fields = (
  9         'content_type', 'content_object', 'comment', 'is_removed',
  10         'is_censored', 'is_moderator_marked', 'creator', 'comment_categories',
  11         'is_blocked'
  12     )
  13     readonly_fields = ('creator', 'content_type', 'content_object')
  14     list_display = (
  15         '__str__', 'creator', 'is_removed', 'is_censored', 'created',
  16         'is_blocked'
  17     )
  18     search_fields = ('comment',)
  19     date_hierarchy = 'created'
  20
  [end of adhocracy4/comments/admin.py]
  </code>
  
  I need you to solve this issue by generating a single patch file that I can apply directly to this repository using git apply. Please respond with a single patch file in the following format.
  <patch>
  diff --git a/file.py b/file.py
  --- a/file.py
  +++ b/file.py
  @@ -1,27 +1,35 @@
   def euclidean(a, b):
  -    while b:
  -        a, b = b, a % b
  -    return a
  +    if b == 0:
  +        return a
  +    return euclidean(b, a % b)
   
   
   def bresenham(x0, y0, x1, y1):
       points = []
       dx = abs(x1 - x0)
       dy = abs(y1 - y0)
  -    sx = 1 if x0 < x1 else -1
  -    sy = 1 if y0 < y1 else -1
  -    err = dx - dy
  +    x, y = x0, y0
  +    sx = -1 if x0 > x1 else 1
  +    sy = -1 if y0 > y1 else 1
   
  -    while True:
  -        points.append((x0, y0))
  -        if x0 == x1 and y0 == y1:
  -            break
  -        e2 = 2 * err
  -        if e2 > -dy:
  -            err -= dy
  -            x0 += sx
  -        if e2 < dx:
  -            err += dx
  -            y0 += sy
  +    if dx > dy:
  +        err = dx / 2.0
  +        while x != x1:
  +            points.append((x, y))
  +            err -= dy
  +            if err < 0:
  +                y += sy
  +                err += dx
  +            x += sx
  +    else:
  +        err = dy / 2.0
  +        while y != y1:
  +            points.append((x, y))
  +            err -= dx
  +            if err < 0:
  +                x += sx
  +                err += dy
  +            y += sy
  +
  +    points.append((x, y))
       return points
  
  </patch>
golden_diff: diff --git a/adhocracy4/comments/admin.py b/adhocracy4/comments/admin.py
  --- a/adhocracy4/comments/admin.py
  +++ b/adhocracy4/comments/admin.py
  @@ -7,13 +7,13 @@
   class CommentAdmin(admin.ModelAdmin):
       fields = (
           'content_type', 'content_object', 'comment', 'is_removed',
  -        'is_censored', 'is_moderator_marked', 'creator', 'comment_categories',
  -        'is_blocked'
  +        'is_censored', 'is_blocked', 'is_moderator_marked',
  +        'creator', 'comment_categories'
       )
       readonly_fields = ('creator', 'content_type', 'content_object')
       list_display = (
  -        '__str__', 'creator', 'is_removed', 'is_censored', 'created',
  -        'is_blocked'
  +        '__str__', 'creator', 'is_removed', 'is_censored',
  +        'is_blocked', 'created'
       )
       search_fields = ('comment',)
       date_hierarchy = 'created'
  
verification_info: {"golden_diff": "diff --git a/adhocracy4/comments/admin.py b/adhocracy4/comments/admin.py\n--- a/adhocracy4/comments/admin.py\n+++ b/adhocracy4/comments/admin.py\n@@ -7,13 +7,13 @@\n class CommentAdmin(admin.ModelAdmin):\n     fields = (\n         'content_type', 'content_object', 'comment', 'is_removed',\n-        'is_censored', 'is_moderator_marked', 'creator', 'comment_categories',\n-        'is_blocked'\n+        'is_censored', 'is_blocked', 'is_moderator_marked',\n+        'creator', 'comment_categories'\n     )\n     readonly_fields = ('creator', 'content_type', 'content_object')\n     list_display = (\n-        '__str__', 'creator', 'is_removed', 'is_censored', 'created',\n-        'is_blocked'\n+        '__str__', 'creator', 'is_removed', 'is_censored',\n+        'is_blocked', 'created'\n     )\n     search_fields = ('comment',)\n     date_hierarchy = 'created'\n", "issue": "django-admin: place comment's is_blocked next to is_censored\n**URL:** \r\n**user:** \r\n**expected behaviour:** As is_removed, is_censored and is_blocked have a very similar behaviour, the is_blocked field should be next to the first two fields. In the detail as well as in the list view\r\n**behaviour:** \r\n**important screensize:**\r\n**device & browser:** \r\n**Comment/Question:** \r\n\r\nScreenshot?\r\n![Screenshot from 2021-11-12 11-20-55](https://user-images.githubusercontent.com/8178179/141452772-f03df35f-b6e4-45d6-8703-c587ff0baef5.png)\r\n![Screenshot from 2021-11-12 11-20-37](https://user-images.githubusercontent.com/8178179/141452773-c511dc84-3c92-49e4-abe8-dbb8022794be.png)\r\n\r\n\n", "before_files": [{"content": "from django.contrib import admin\n\nfrom .models import Comment\n\n\n@admin.register(Comment)\nclass CommentAdmin(admin.ModelAdmin):\n    fields = (\n        'content_type', 'content_object', 'comment', 'is_removed',\n        'is_censored', 'is_moderator_marked', 'creator', 'comment_categories',\n        'is_blocked'\n    )\n    readonly_fields = ('creator', 'content_type', 'content_object')\n    list_display = (\n        '__str__', 'creator', 'is_removed', 'is_censored', 'created',\n        'is_blocked'\n    )\n    search_fields = ('comment',)\n    date_hierarchy = 'created'\n", "path": "adhocracy4/comments/admin.py"}]}