[Fixes #12924] merge with master

geonode/documents/admin.py

@@ -35,7 +35,7 @@ class Meta(ResourceBaseAdminForm.Meta):
 
 
 class DocumentAdmin(TabbedTranslationAdmin):
-    exclude = ("ll_bbox_polygon", "bbox_polygon", "srid")
+    exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
     list_display = (
         "id",
         "title",

geonode/geoapps/admin.py

@@ -32,7 +32,7 @@ class Meta(ResourceBaseAdminForm.Meta):
 
 
 class GeoAppAdmin(TabbedTranslationAdmin):
-    exclude = ("ll_bbox_polygon", "bbox_polygon", "srid")
+    exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
     list_display_links = ("title",)
     list_display = (
         "id",

geonode/layers/admin.py

@@ -18,18 +18,12 @@
 #########################################################################
 
 from django.contrib import admin
-from django.db.models import Prefetch
 
 from modeltranslation.admin import TabbedTranslationAdmin
 
 from geonode.base.admin import ResourceBaseAdminForm
 from geonode.layers.models import Dataset, Attribute, Style
 
-from geonode.base.fields import MultiThesauriField
-from geonode.base.models import ThesaurusKeyword, ThesaurusKeywordLabel
-
-from dal import autocomplete
-
 
 class AttributeInline(admin.TabularInline):
     model = Attribute
@@ -40,21 +34,9 @@ class Meta(ResourceBaseAdminForm.Meta):
         model = Dataset
         fields = "__all__"
 
-    tkeywords = MultiThesauriField(
-        queryset=ThesaurusKeyword.objects.prefetch_related(
-            Prefetch("keyword", queryset=ThesaurusKeywordLabel.objects.filter(lang="en"))
-        ),
-        widget=autocomplete.ModelSelect2Multiple(
-            url="thesaurus_autocomplete",
-        ),
-        label=("Keywords from Thesaurus"),
-        required=False,
-        help_text=("List of keywords from Thesaurus",),
-    )
-
 
 class DatasetAdmin(TabbedTranslationAdmin):
-    exclude = ("ll_bbox_polygon", "bbox_polygon", "srid")
+    exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
     list_display = (
         "id",
         "alternate",

geonode/maps/admin.py

@@ -43,7 +43,7 @@ class MapAdmin(TabbedTranslationAdmin):
     inlines = [
         MapLayerInline,
     ]
-    exclude = ("ll_bbox_polygon", "bbox_polygon", "srid")
+    exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
     list_display_links = ("title",)
     list_display = (
         "id",

requirements.txt

@@ -94,7 +94,7 @@ geonode-user-messages==2.0.2.2
 geonode-announcements==2.0.2.2
 django-activity-stream==2.0.0
 gn-arcrest==10.5.6
-geoserver-restconfig~=2.0.12
+geoserver-restconfig~=2.0.13
 gn-gsimporter==2.0.4
 gisdata==0.5.4
 

setup.cfg

@@ -119,7 +119,7 @@ install_requires =
     geonode-announcements==2.0.2.2
     django-activity-stream==2.0.0
     gn-arcrest==10.5.6
-    geoserver-restconfig~=2.0.12
+    geoserver-restconfig~=2.0.13
     gn-gsimporter==2.0.4
     gisdata==0.5.4