diff --git a/Changelog.md b/Changelog.md index 68ae23c..2fd807b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,9 +1,14 @@ # CHANGELOG.md -##Unreleased +## Unreleased Bugfixes: - - issue#10077: efficient input lookup for organization column in Person + - issue#10106 + - Organisation : add country to the list at the end + - Mountain Ranges: add country at the end. sort the range names in alphabetical order. + - Persons: should have organisation name in the list view + - Resources: Alphabetically sort the titles + - issue#10077: efficient input lookup for organization column in Person ## 1.8 (2022-01-04) @@ -83,4 +88,4 @@ Bugfixes: Features: - First release includes functioning django admin interfaces for - `Person` and `Range` models \ No newline at end of file + `Person` and `Range` models diff --git a/app/admin.py b/app/admin.py index 8aa06f7..34589ae 100644 --- a/app/admin.py +++ b/app/admin.py @@ -58,7 +58,7 @@ class PersonAdmin(admin.ModelAdmin): ), }), ) - list_display = ['id', 'full_name' ] + list_display = ['id', 'full_name', 'organization'] autocomplete_fields = ['organization'] # list_display_links = ['id'] @@ -87,6 +87,7 @@ class ResourceAdmin(admin.ModelAdmin): search_fields = ['title', 'url', 'citation', 'abstract'] readonly_fields = ['id'] list_display = ['title', 'citation', 'type'] + ordering = ['title'] fieldsets = ( (None, { 'fields': ( @@ -163,7 +164,8 @@ class RangeAdmin(admin.ModelAdmin): 'fields': ('comments',), }) ) - list_display = ['range_name', 'countries', 'mother_range'] + list_display = ['range_name', 'mother_range', 'countries'] + ordering = ['range_name'] class PeopleOrganizationInline(admin.TabularInline): @@ -178,7 +180,7 @@ class OrganizationAdmin(admin.ModelAdmin): ] readonly_fields = ('org_num1',) search_fields = ['organisation_search', 'org_alpha_search', 'organisation_2', 'organisation_3', 'subject'] - list_display = ['organisation_english', 'organisation_2'] + list_display = ['organisation_english', 'organisation_2', 'country'] fieldsets = ( (None, { 'fields': (