Merge branch 'master' into 10106/update-list-view
This commit is contained in:
commit
9130fab8a5
3 changed files with 4 additions and 2 deletions
|
@ -8,6 +8,7 @@ Bugfixes:
|
||||||
- Mountain Ranges: add country at the end. sort the range names in alphabetical order.
|
- Mountain Ranges: add country at the end. sort the range names in alphabetical order.
|
||||||
- Persons: should have organisation name in the list view
|
- Persons: should have organisation name in the list view
|
||||||
- Resources: Alphabetically sort the titles
|
- Resources: Alphabetically sort the titles
|
||||||
|
- issue#10077: efficient input lookup for organization column in Person
|
||||||
|
|
||||||
## 1.8 (2022-01-04)
|
## 1.8 (2022-01-04)
|
||||||
|
|
||||||
|
@ -87,4 +88,4 @@ Bugfixes:
|
||||||
|
|
||||||
Features:
|
Features:
|
||||||
- First release includes functioning django admin interfaces for
|
- First release includes functioning django admin interfaces for
|
||||||
`Person` and `Range` models
|
`Person` and `Range` models
|
||||||
|
|
|
@ -59,6 +59,7 @@ class PersonAdmin(admin.ModelAdmin):
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
list_display = ['id', 'full_name', 'organization']
|
list_display = ['id', 'full_name', 'organization']
|
||||||
|
autocomplete_fields = ['organization']
|
||||||
# list_display_links = ['id']
|
# list_display_links = ['id']
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -428,7 +428,7 @@ class Organisation(models.Model):
|
||||||
else:
|
else:
|
||||||
name = f"{self.organisation_english}"
|
name = f"{self.organisation_english}"
|
||||||
else:
|
else:
|
||||||
name = 'NO NAME DEFINED!!!'
|
name = '---'
|
||||||
|
|
||||||
return name
|
return name
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue