Skip to content

Commit

Permalink
[Issue #6925] Thesaurus admin pages (#6990)
Browse files Browse the repository at this point in the history
* [Issue #6925] Thesaurus admin pages

* [Issue #6925] Thesaurus admin pages
  • Loading branch information
etj authored Feb 26, 2021
1 parent 7d6fcd2 commit 5aa1945
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 7 deletions.
61 changes: 61 additions & 0 deletions geonode/base/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
MenuItem,
CuratedThumbnail,
Configuration,
Thesaurus, ThesaurusLabel, ThesaurusKeyword, ThesaurusKeywordLabel,
)

from geonode.base.forms import (
Expand Down Expand Up @@ -268,6 +269,62 @@ def get_form(self, request, obj=None, **kwargs):
return form


class ThesaurusAdmin(admin.ModelAdmin):
model = Thesaurus
list_display = ('id', 'identifier')
list_display_links = ('id', 'identifier')
ordering = ('identifier',)


class ThesaurusLabelAdmin(admin.ModelAdmin):
model = ThesaurusLabel
list_display = ('thesaurus_id', 'lang', 'label')
list_display_links = ('label',)
ordering = ('thesaurus__identifier', 'lang')

def thesaurus_id(self, obj):
return obj.thesaurus.identifier

thesaurus_id.short_description = 'Thesaurus'
thesaurus_id.admin_order_field = 'thesaurus__identifier'


class ThesaurusKeywordAdmin(admin.ModelAdmin):
model = ThesaurusKeyword

list_display = ('thesaurus_id', 'about', 'alt_label',)
list_display_links = ('about', 'alt_label',)
ordering = ('thesaurus__identifier', 'alt_label',)
list_filter = ('thesaurus_id',)

def thesaurus_id(self, obj):
return obj.thesaurus.identifier

thesaurus_id.short_description = 'Thesaurus'
thesaurus_id.admin_order_field = 'thesaurus__identifier'


class ThesaurusKeywordLabelAdmin(admin.ModelAdmin):
model = ThesaurusKeywordLabel

list_display = ('thesaurus_id', 'keyword_id', 'lang', 'label')
list_display_links = ('lang', 'label')
ordering = ('keyword__thesaurus__identifier', 'keyword__alt_label', 'lang')
list_filter = ('keyword__thesaurus__identifier', 'keyword_id', 'lang')

def thesaurus_id(self, obj):
return obj.keyword.thesaurus.identifier

thesaurus_id.short_description = 'Thesaurus'
thesaurus_id.admin_order_field = 'keyword__thesaurus__identifier'

def keyword_id(self, obj):
return obj.keyword.alt_label

keyword_id.short_description = 'Keyword'
keyword_id.admin_order_field = 'keyword__alt_label'


admin.site.register(TopicCategory, TopicCategoryAdmin)
admin.site.register(Region, RegionAdmin)
admin.site.register(SpatialRepresentationType, SpatialRepresentationTypeAdmin)
Expand All @@ -281,6 +338,10 @@ def get_form(self, request, obj=None, **kwargs):
admin.site.register(MenuItem, MenuItemAdmin)
admin.site.register(CuratedThumbnail, CuratedThumbnailAdmin)
admin.site.register(Configuration, ConfigurationAdmin)
admin.site.register(Thesaurus, ThesaurusAdmin)
admin.site.register(ThesaurusLabel, ThesaurusLabelAdmin)
admin.site.register(ThesaurusKeyword, ThesaurusKeywordAdmin)
admin.site.register(ThesaurusKeywordLabel, ThesaurusKeywordLabelAdmin)


class ResourceBaseAdminForm(autocomplete.FutureModelForm):
Expand Down
2 changes: 1 addition & 1 deletion geonode/base/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ def __str__(self):

class Meta:
ordering = ("keyword", "lang")
verbose_name_plural = 'Labels'
verbose_name_plural = 'Thesaurus Keyword Labels'
unique_together = (("keyword", "lang"),)


Expand Down
7 changes: 1 addition & 6 deletions geonode/layers/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
from geonode.layers.models import LayerFile, UploadSession

from geonode.base.fields import MultiThesauriField
from geonode.base.models import ThesaurusKeyword, ThesaurusKeywordLabel, Thesaurus
from geonode.base.models import ThesaurusKeyword, ThesaurusKeywordLabel

from dal import autocomplete

Expand Down Expand Up @@ -98,10 +98,6 @@ class AttributeAdmin(admin.ModelAdmin):
search_fields = ('attribute', 'attribute_label',)


class ThesaurusAdmin(admin.ModelAdmin):
model = Thesaurus


class StyleAdmin(admin.ModelAdmin):
model = Style
list_display_links = ('sld_title',)
Expand All @@ -124,4 +120,3 @@ class UploadSessionAdmin(admin.ModelAdmin):
admin.site.register(Attribute, AttributeAdmin)
admin.site.register(Style, StyleAdmin)
admin.site.register(UploadSession, UploadSessionAdmin)
admin.site.register(Thesaurus, ThesaurusAdmin)

0 comments on commit 5aa1945

Please sign in to comment.