[Issue GeoNode#4276] Updating django-autocomplete-light to version 3.5.0

srtonz · Jan 6, 2020 · 00bc860 · 00bc860
1 parent 87d0431
commit 00bc860
Show file tree

Hide file tree

Showing 55 changed files with 909 additions and 753 deletions.
diff --git a/geonode/base/admin.py b/geonode/base/admin.py
@@ -29,14 +29,14 @@
 except ImportError:
     from io import StringIO
 
-from autocomplete_light.forms import ModelForm
-from autocomplete_light.forms import modelform_factory
-from autocomplete_light.contrib.taggit_field import TaggitField, TaggitWidget
+from dal import autocomplete
+from taggit.forms import TagField
+from django import forms
 
 from treebeard.admin import TreeAdmin
 from treebeard.forms import movenodeform_factory
 
-from modeltranslation.admin import TranslationAdmin
+from modeltranslation.admin import TabbedTranslationAdmin
 
 from geonode.base.models import (
     TopicCategory,
@@ -55,6 +55,8 @@
 )
 from django.http import HttpResponseRedirect
 
+from geonode.base.widgets import TaggitSelect2Custom
+
 
 def metadata_batch_edit(modeladmin, request, queryset):
     ids = ','.join([str(element.pk) for element in queryset])
@@ -76,17 +78,7 @@ def set_batch_permissions(modeladmin, request, queryset):
 set_batch_permissions.short_description = 'Set permissions'
 
 
-class MediaTranslationAdmin(TranslationAdmin):
-    class Media:
-        js = (
-            'modeltranslation/js/tabbed_translation_fields.js',
-        )
-        css = {
-            'screen': ('modeltranslation/css/tabbed_translation_fields.css',),
-        }
-
-
-class BackupAdminForm(ModelForm):
+class BackupAdminForm(forms.ModelForm):
 
     class Meta:
         model = Backup
@@ -140,7 +132,7 @@ def restore(self, request, queryset):
         if request.POST.get("post"):
             for siteObj in queryset:
                 self.message_user(request, "Executed Restore: " + siteObj.name)
-                out = StringIO()
+                out = StringIO.StringIO()
                 if siteObj.location:
                     call_command(
                         'restore', force_exec=True, backup_file=str(
@@ -166,7 +158,7 @@ def restore(self, request, queryset):
 restore.short_description = "Run the Restore"
 
 
-class BackupAdmin(MediaTranslationAdmin):
+class BackupAdmin(TabbedTranslationAdmin):
     list_display = ('id', 'name', 'date', 'location')
     list_display_links = ('name',)
     date_hierarchy = 'date'
@@ -175,13 +167,13 @@ class BackupAdmin(MediaTranslationAdmin):
     actions = [run, restore]
 
 
-class LicenseAdmin(MediaTranslationAdmin):
+class LicenseAdmin(TabbedTranslationAdmin):
     model = License
     list_display = ('id', 'name')
     list_display_links = ('name',)
 
 
-class TopicCategoryAdmin(MediaTranslationAdmin):
+class TopicCategoryAdmin(TabbedTranslationAdmin):
     model = TopicCategory
     list_display_links = ('identifier',)
     list_display = (
@@ -208,15 +200,15 @@ def has_delete_permission(self, request, obj=None):
             return False
 
 
-class RegionAdmin(MediaTranslationAdmin):
+class RegionAdmin(TabbedTranslationAdmin):
     model = Region
     list_display_links = ('name',)
     list_display = ('code', 'name', 'parent')
     search_fields = ('code', 'name',)
     group_fieldsets = True
 
 
-class SpatialRepresentationTypeAdmin(MediaTranslationAdmin):
+class SpatialRepresentationTypeAdmin(TabbedTranslationAdmin):
     model = SpatialRepresentationType
     list_display_links = ('identifier',)
     list_display = ('identifier', 'description', 'gn_description', 'is_choice')
@@ -230,7 +222,7 @@ def has_delete_permission(self, request, obj=None):
         return False
 
 
-class RestrictionCodeTypeAdmin(MediaTranslationAdmin):
+class RestrictionCodeTypeAdmin(TabbedTranslationAdmin):
     model = RestrictionCodeType
     list_display_links = ('identifier',)
     list_display = ('identifier', 'description', 'gn_description', 'is_choice')
@@ -249,7 +241,7 @@ class ContactRoleAdmin(admin.ModelAdmin):
     list_display_links = ('id',)
     list_display = ('id', 'contact', 'resource', 'role')
     list_editable = ('contact', 'resource', 'role')
-    form = modelform_factory(ContactRole, fields='__all__')
+    form = forms.modelform_factory(ContactRole, fields='__all__')
 
 
 class LinkAdmin(admin.ModelAdmin):
@@ -258,7 +250,7 @@ class LinkAdmin(admin.ModelAdmin):
     list_display = ('id', 'resource', 'extension', 'link_type', 'name', 'mime')
     list_filter = ('resource', 'extension', 'link_type', 'mime')
     search_fields = ('name', 'resource__title',)
-    form = modelform_factory(Link, fields='__all__')
+    form = forms.modelform_factory(Link, fields='__all__')
 
 
 class HierarchicalKeywordAdmin(TreeAdmin):
@@ -301,12 +293,9 @@ class CuratedThumbnailAdmin(admin.ModelAdmin):
 admin.site.register(CuratedThumbnail, CuratedThumbnailAdmin)
 
 
-class ResourceBaseAdminForm(ModelForm):
-    # We need to specify autocomplete='TagAutocomplete' or admin views like
-    # /admin/maps/map/2/ raise exceptions during form rendering.
-    # But if we specify it up front, TaggitField.__init__ throws an exception
-    # which prevents app startup. Therefore, we defer setting the widget until
-    # after that's done.
-    keywords = TaggitField(required=False)
-    keywords.widget = TaggitWidget(
-        autocomplete='HierarchicalKeywordAutocomplete')
+class ResourceBaseAdminForm(autocomplete.FutureModelForm):
+
+    keywords = TagField(widget=TaggitSelect2Custom('autocomplete_hierachical_keyword'))
+
+    class Meta:
+        pass
diff --git a/geonode/base/autocomplete_light_registry.py b/geonode/base/autocomplete_light_registry.py
diff --git a/geonode/base/fields.py b/geonode/base/fields.py
@@ -18,46 +18,13 @@
 #
 #########################################################################
 
-import logging
-import traceback
-
 from django import forms
-from django.conf import settings
-
-from geonode.base.models import Thesaurus
-
-from .widgets import MultiThesaurusWidget
-
-logger = logging.getLogger(__name__)
-
-
-class MultiThesauriField(forms.MultiValueField):
-
-    widget = MultiThesaurusWidget()
 
-    def __init__(self, *args, **kwargs):
-        super(MultiThesauriField, self).__init__(*args, **kwargs)
-        self.require_all_fields = kwargs.pop('require_all_fields', True)
 
-        if hasattr(settings, 'THESAURUS') and settings.THESAURUS:
-            el = settings.THESAURUS
-            choices_list = []
-            thesaurus_name = el['name']
-            try:
-                t = Thesaurus.objects.get(identifier=thesaurus_name)
-                for tk in t.thesaurus.all():
-                    tkl = tk.keyword.filter(lang='en')
-                    choices_list.append((tkl[0].id, tkl[0].label))
-                self.fields += (forms.MultipleChoiceField(choices=tuple(choices_list)), )
-            except BaseException:
-                tb = traceback.format_exc()
-                logger.exception(tb)
+class MultiThesauriField(forms.ModelMultipleChoiceField):
 
-        for f in self.fields:
-            f.error_messages.setdefault('incomplete',
-                                        self.error_messages['incomplete'])
-            if self.require_all_fields:
-                # Set 'required' to False on the individual fields, because the
-                # required validation will be handled by MultiValueField, not
-                # by those individual fields.
-                f.required = False
+    def label_from_instance(self, obj):
+        # Note: Not using .get() because filter()[0] is used in original
+        # code. The hard-coded language is currently used throughout
+        # geonode.
+        return obj.keyword.filter(lang='en').first().label