Skip to content

Commit e15b56c

Browse files
[Fixes #12921] Fix Layers admin interface raise error (#12922)
* [Fixes #12921] Fix Layers admin interface raise error * [Fixes #12921] Fix Layers admin interface raise error
1 parent 267ad61 commit e15b56c

File tree

5 files changed

+4
-25
lines changed

5 files changed

+4
-25
lines changed

geonode/base/forms.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,6 @@ class Meta:
247247
queryset=ThesaurusKeyword.objects.prefetch_related(
248248
Prefetch("keyword", queryset=ThesaurusKeywordLabel.objects.filter(lang="en"))
249249
),
250-
widget=autocomplete.ModelSelect2Multiple(
251-
url="thesaurus_autocomplete",
252-
),
253250
label=_("Keywords from Thesaurus"),
254251
required=False,
255252
help_text=_(

geonode/documents/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Meta(ResourceBaseAdminForm.Meta):
3636

3737

3838
class DocumentAdmin(TabbedTranslationAdmin):
39-
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid")
39+
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
4040
list_display = (
4141
"id",
4242
"title",

geonode/geoapps/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Meta(ResourceBaseAdminForm.Meta):
3232

3333

3434
class GeoAppAdmin(TabbedTranslationAdmin):
35-
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid")
35+
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
3636
list_display_links = ("title",)
3737
list_display = (
3838
"id",

geonode/layers/admin.py

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,13 @@
1818
#########################################################################
1919

2020
from django.contrib import admin
21-
from django.db.models import Prefetch
2221

2322
from modeltranslation.admin import TabbedTranslationAdmin
2423

2524
from geonode.base.admin import ResourceBaseAdminForm
2625
from geonode.layers.models import Dataset, Attribute, Style
2726
from geonode.base.admin import metadata_batch_edit
2827

29-
from geonode.base.fields import MultiThesauriField
30-
from geonode.base.models import ThesaurusKeyword, ThesaurusKeywordLabel
31-
32-
from dal import autocomplete
33-
3428

3529
class AttributeInline(admin.TabularInline):
3630
model = Attribute
@@ -41,21 +35,9 @@ class Meta(ResourceBaseAdminForm.Meta):
4135
model = Dataset
4236
fields = "__all__"
4337

44-
tkeywords = MultiThesauriField(
45-
queryset=ThesaurusKeyword.objects.prefetch_related(
46-
Prefetch("keyword", queryset=ThesaurusKeywordLabel.objects.filter(lang="en"))
47-
),
48-
widget=autocomplete.ModelSelect2Multiple(
49-
url="thesaurus_autocomplete",
50-
),
51-
label=("Keywords from Thesaurus"),
52-
required=False,
53-
help_text=("List of keywords from Thesaurus",),
54-
)
55-
5638

5739
class DatasetAdmin(TabbedTranslationAdmin):
58-
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid")
40+
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
5941
list_display = (
6042
"id",
6143
"alternate",

geonode/maps/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class MapAdmin(TabbedTranslationAdmin):
4444
inlines = [
4545
MapLayerInline,
4646
]
47-
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid")
47+
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
4848
list_display_links = ("title",)
4949
list_display = (
5050
"id",

0 commit comments

Comments
 (0)