Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions geonode/base/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
from treebeard.admin import TreeAdmin
from treebeard.forms import movenodeform_factory

from modeltranslation.admin import TabbedTranslationAdmin

from geonode.base.management.commands.thesaurus_subcommands.load import ACTION_UPDATE
from geonode.base.models import (
TopicCategory,
Expand Down Expand Up @@ -79,13 +77,13 @@ def set_user_and_group_dataset_permission(modeladmin, request, queryset):
set_user_and_group_dataset_permission.short_description = "Set layer permissions"


class LicenseAdmin(TabbedTranslationAdmin):
class LicenseAdmin(admin.ModelAdmin):
model = License
list_display = ("id", "name")
list_display_links = ("name",)


class TopicCategoryAdmin(TabbedTranslationAdmin):
class TopicCategoryAdmin(admin.ModelAdmin):
model = TopicCategory
list_display_links = ("identifier",)
list_display = ("identifier", "description", "gn_description", "fa_class", "is_choice")
Expand All @@ -110,7 +108,7 @@ def has_delete_permission(self, request, obj=None):
return False


class RegionAdmin(TabbedTranslationAdmin):
class RegionAdmin(admin.ModelAdmin):
model = Region
list_display_links = ("name",)
list_display = ("code", "name", "parent")
Expand All @@ -121,7 +119,7 @@ class RegionAdmin(TabbedTranslationAdmin):
group_fieldsets = True


class SpatialRepresentationTypeAdmin(TabbedTranslationAdmin):
class SpatialRepresentationTypeAdmin(admin.ModelAdmin):
model = SpatialRepresentationType
list_display_links = ("identifier",)
list_display = ("identifier", "description", "gn_description", "is_choice")
Expand All @@ -135,7 +133,7 @@ def has_delete_permission(self, request, obj=None):
return False


class RestrictionCodeTypeAdmin(TabbedTranslationAdmin):
class RestrictionCodeTypeAdmin(admin.ModelAdmin):
model = RestrictionCodeType
list_display_links = ("identifier",)
list_display = ("identifier", "description", "gn_description", "is_choice")
Expand Down
53 changes: 53 additions & 0 deletions geonode/base/migrations/0096_remove_modeltranslation.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# Generated by Django 5.2 on 2025-10-21 13:47

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("base", "0095_alter_configuration_id_alter_contactrole_id_and_more"),
]

operations = [
migrations.RemoveField(
model_name="license",
name="description_en",
),
migrations.RemoveField(
model_name="license",
name="license_text_en",
),
migrations.RemoveField(
model_name="license",
name="name_en",
),
migrations.RemoveField(
model_name="region",
name="name_en",
),
migrations.RemoveField(
model_name="restrictioncodetype",
name="description_en",
),
migrations.RemoveField(
model_name="restrictioncodetype",
name="gn_description_en",
),
migrations.RemoveField(
model_name="spatialrepresentationtype",
name="description_en",
),
migrations.RemoveField(
model_name="spatialrepresentationtype",
name="gn_description_en",
),
migrations.RemoveField(
model_name="topiccategory",
name="description_en",
),
migrations.RemoveField(
model_name="topiccategory",
name="gn_description_en",
),
]
69 changes: 0 additions & 69 deletions geonode/base/translation.py

This file was deleted.

4 changes: 1 addition & 3 deletions geonode/documents/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

from django.contrib import admin

from modeltranslation.admin import TabbedTranslationAdmin

from geonode.documents.models import Document
from geonode.base.admin import ResourceBaseAdminForm, SparseInline

Expand All @@ -34,7 +32,7 @@ class Meta(ResourceBaseAdminForm.Meta):
# )


class DocumentAdmin(TabbedTranslationAdmin):
class DocumentAdmin(admin.ModelAdmin):
inlines = (SparseInline,)
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
list_display = (
Expand Down
4 changes: 1 addition & 3 deletions geonode/documents/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import json
import logging

from modeltranslation.forms import TranslationModelForm

from django import forms
from django.conf import settings
from django.forms import HiddenInput
Expand Down Expand Up @@ -76,7 +74,7 @@ def _get_max_size(self):
return max_size_db_obj.max_size


class DocumentCreateForm(TranslationModelForm):
class DocumentCreateForm(forms.ModelForm):
"""
The document upload form.
"""
Expand Down
37 changes: 37 additions & 0 deletions geonode/documents/migrations/0039_remove_modeltranslation.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Generated by Django 5.2 on 2025-10-21 13:47

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("documents", "0038_alter_document_doc_url"),
]

operations = [
migrations.RemoveField(
model_name="document",
name="abstract_en",
),
migrations.RemoveField(
model_name="document",
name="constraints_other_en",
),
migrations.RemoveField(
model_name="document",
name="data_quality_statement_en",
),
migrations.RemoveField(
model_name="document",
name="purpose_en",
),
migrations.RemoveField(
model_name="document",
name="supplemental_information_en",
),
migrations.RemoveField(
model_name="document",
name="title_en",
),
]
35 changes: 0 additions & 35 deletions geonode/documents/translation.py

This file was deleted.

4 changes: 1 addition & 3 deletions geonode/geoapps/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@

from django.contrib import admin

from modeltranslation.admin import TabbedTranslationAdmin

from geonode.geoapps.models import GeoApp
from geonode.base.admin import ResourceBaseAdminForm

Expand All @@ -31,7 +29,7 @@ class Meta(ResourceBaseAdminForm.Meta):
fields = "__all__"


class GeoAppAdmin(TabbedTranslationAdmin):
class GeoAppAdmin(admin.ModelAdmin):
exclude = ("ll_bbox_polygon", "bbox_polygon", "srid", "tkeywords")
list_display_links = ("title",)
list_display = (
Expand Down
28 changes: 0 additions & 28 deletions geonode/geoapps/translation.py

This file was deleted.

3 changes: 1 addition & 2 deletions geonode/groups/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@
#########################################################################

from django.contrib import admin
from modeltranslation.admin import TranslationAdmin
from geonode.base.admin import set_user_and_group_dataset_permission

from . import models


@admin.register(models.GroupCategory)
class GroupCategoryAdmin(TranslationAdmin):
class GroupCategoryAdmin(admin.ModelAdmin):
list_display = (
"name",
"slug",
Expand Down
3 changes: 1 addition & 2 deletions geonode/groups/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,14 @@
from django import forms
from slugify import slugify
from django.utils.translation import gettext_lazy as _
from modeltranslation.forms import TranslationModelForm

from django.contrib.auth import get_user_model

from geonode.groups.models import GroupProfile
from geonode.base.widgets import TaggitSelect2Custom


class GroupForm(TranslationModelForm):
class GroupForm(forms.ModelForm):
slug = forms.SlugField(
help_text=_("a short version of the name consisting only of letters, numbers, underscores and hyphens."),
widget=forms.HiddenInput,
Expand Down
25 changes: 25 additions & 0 deletions geonode/groups/migrations/0035_remove_modeltranslation.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Generated by Django 5.2 on 2025-10-21 13:47

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
("groups", "0034_auto_20200512_1431"),
]

operations = [
migrations.RemoveField(
model_name="groupcategory",
name="name_en",
),
migrations.RemoveField(
model_name="groupprofile",
name="description_en",
),
migrations.RemoveField(
model_name="groupprofile",
name="title_en",
),
]
Loading
Loading