Skip to content

Commit 4266382

Browse files
authored
Merge pull request #1972 from IFRCGo/feature/country-page
Feature/country page
2 parents c18034e + 3ece1e3 commit 4266382

File tree

119 files changed

+5194
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+5194
-232
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
build:
66
machine:
77
# Check https://circleci.com/developer/machine/image/ubuntu-2004 for details:
8-
image: ubuntu-2004:202201-02
8+
image: default
99
docker_layer_caching: true
1010
steps:
1111
- checkout

DO.csv

Lines changed: 72 additions & 0 deletions
Large diffs are not rendered by default.

api/admin.py

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,11 @@ class CountryKeyFigureInline(admin.TabularInline, TranslationInlineModelAdmin):
463463
model = models.CountryKeyFigure
464464

465465

466-
class RegionKeyFigureInline(admin.TabularInline, TranslationInlineModelAdmin):
466+
class CountryDirectoryInline(admin.TabularInline):
467+
model = models.CountryDirectory
468+
469+
470+
class RegionKeyFigureInline(admin.TabularInline):
467471
model = models.RegionKeyFigure
468472

469473

@@ -506,6 +510,13 @@ class RegionLinkInline(admin.TabularInline):
506510
class CountryContactInline(admin.TabularInline):
507511
model = models.CountryContact
508512

513+
class CountryKeyDocumentInline(admin.TabularInline):
514+
model = models.CountryKeyDocument
515+
516+
517+
class CountryICRCPresenceInline(admin.TabularInline):
518+
model = models.CountryICRCPresence
519+
509520

510521
class RegionContactInline(admin.TabularInline):
511522
model = models.RegionContact
@@ -520,6 +531,22 @@ class DistrictAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedA
520531
modifiable = True
521532

522533

534+
class NSDInitiativesAdmin(admin.TabularInline):
535+
model = models.NSDInitiatives
536+
537+
538+
class CountryCapacityStrengtheningAdmin(admin.TabularInline):
539+
model = models.CountryCapacityStrengthening
540+
541+
542+
class CountryOrganizationalCapacityAdmin(admin.TabularInline):
543+
model = models.CountryOrganizationalCapacity
544+
545+
546+
class CountrySupportingPartnerAdmin(admin.TabularInline):
547+
model = models.CountrySupportingPartner
548+
549+
523550
class CountryAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAdmin, TranslationAdmin):
524551
country_in = 'pk__in'
525552
list_filter = ('record_type', 'in_search', 'independent', 'disputed')
@@ -528,7 +555,19 @@ class CountryAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAd
528555
list_editable = ('record_type',)
529556
search_fields = ('name',)
530557
modifiable = True
531-
inlines = [CountryKeyFigureInline, CountrySnippetInline, CountryLinkInline, CountryContactInline]
558+
inlines = [
559+
CountryKeyFigureInline,
560+
CountrySnippetInline,
561+
CountryLinkInline,
562+
CountryContactInline,
563+
CountryDirectoryInline,
564+
CountryKeyDocumentInline,
565+
NSDInitiativesAdmin,
566+
CountryCapacityStrengtheningAdmin,
567+
CountryOrganizationalCapacityAdmin,
568+
CountrySupportingPartnerAdmin,
569+
CountryICRCPresenceInline,
570+
]
532571
exclude = ('key_priorities',)
533572

534573

0 commit comments

Comments
 (0)