Merge branch 'main' into dk/1989-export-import-tables

This commit is contained in:
David Kennedy 2024-04-22 12:14:04 -04:00
commit 4f2a2f90de
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
10 changed files with 213 additions and 25 deletions

View file

@ -1005,7 +1005,9 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"classes": ["collapse"],
"fields": [
"federal_type",
"federal_agency",
# "updated_federal_agency",
# Above field commented out so it won't display
"federal_agency", # TODO: remove later
"tribe_name",
"federally_recognized_tribe",
"state_recognized_tribe",
@ -1252,7 +1254,9 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"classes": ["collapse"],
"fields": [
"federal_type",
"federal_agency",
# "updated_federal_agency",
# Above field commented out so it won't display
"federal_agency", # TODO: remove later
"tribe_name",
"federally_recognized_tribe",
"state_recognized_tribe",