From 1c2641af0de16b77ba465b2569b0ef90ef0ac889 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 4 Jan 2022 22:26:58 +0530 Subject: [PATCH 1/3] Update the list view 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 --- app/admin.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/admin.py b/app/admin.py index 25ec099..a5bb790 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'] # list_display_links = ['id'] @@ -86,6 +86,7 @@ class ResourceAdmin(admin.ModelAdmin): search_fields = ['title', 'url', 'citation', 'abstract'] readonly_fields = ['id'] list_display = ['title', 'citation', 'type'] + ordering = ['title'] fieldsets = ( (None, { 'fields': ( @@ -162,7 +163,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): @@ -177,7 +179,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': ( From d70284d1fca8cd0abaab943b641415faffc3027f Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 4 Jan 2022 22:30:35 +0530 Subject: [PATCH 2/3] Update Changelog --- Changelog.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Changelog.md b/Changelog.md index 85fa31e..6dfef0a 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,14 @@ # CHANGELOG.md +## Unreleased + +Bugfixes: + - issue#10107 + - 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 + ## 1.8 (2022-01-04) Bugfixes: From 99f14d0ce4cf974a5ba957436e8c2ff3370a7ce4 Mon Sep 17 00:00:00 2001 From: PCoder Date: Tue, 4 Jan 2022 22:31:14 +0530 Subject: [PATCH 3/3] Change issue number --- Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 6dfef0a..c3b3bb7 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,7 +3,7 @@ ## Unreleased Bugfixes: - - issue#10107 + - 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