Browse Source

re-enable autocomplete tag field for now as its breaking action buttons display

Nick Sweeting 1 year ago
parent
commit
fcdc41a1ab
3 changed files with 16 additions and 15 deletions
  1. 12 12
      archivebox/core/admin.py
  2. 2 1
      archivebox/core/apps.py
  3. 2 2
      archivebox/core/settings.py

+ 12 - 12
archivebox/core/admin.py

@@ -48,25 +48,25 @@ class TagInline(admin.TabularInline):
 from django.contrib.admin.helpers import ActionForm
 from django.contrib.admin.widgets import AutocompleteSelectMultiple
 
-# WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
-# class AutocompleteTags:
-#     model = Tag
-#     search_fields = ['name']
-#     name = 'tags'
+# WIP: broken by Django 3.1.2 -> 4.0 migration
+class AutocompleteTags:
+    model = Tag
+    search_fields = ['name']
+    name = 'tags'
 
-# class AutocompleteTagsAdminStub:
-#     name = 'admin'
+class AutocompleteTagsAdminStub:
+    name = 'admin'
 
 
 class SnapshotActionForm(ActionForm):
     tags = forms.ModelMultipleChoiceField(
         queryset=Tag.objects.all(),
         required=False,
-        # WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
-        # widget=AutocompleteSelectMultiple(
-        #     # AutocompleteTags(),
-        #     # AutocompleteTagsAdminStub(),
-        # ),
+        # WIP: broken by Django 3.1.2 -> 4.0 migration
+        widget=AutocompleteSelectMultiple(
+            AutocompleteTags(),
+            AutocompleteTagsAdminStub(),
+        ),
     )
 
     # TODO: allow selecting actions for specific extractors? is this useful?

+ 2 - 1
archivebox/core/apps.py

@@ -3,4 +3,5 @@ from django.apps import AppConfig
 
 class CoreConfig(AppConfig):
     name = 'core'
-    # default_auto_field = 'django.db.models.UUIDField'
+    # WIP: broken by Django 3.1.2 -> 4.0 migration
+    default_auto_field = 'django.db.models.UUIDField'

+ 2 - 2
archivebox/core/settings.py

@@ -268,8 +268,8 @@ AUTH_PASSWORD_VALIDATORS = [
     {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
 ]
 
-# WIP: commented out because broken by Django 3.1.2 -> 4.0 migration
-# DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField'
+# WIP: broken by Django 3.1.2 -> 4.0 migration
+DEFAULT_AUTO_FIELD = 'django.db.models.UUIDField'
 
 ################################################################################
 ### Shell Settings