ungleich-public/gmba_django
6
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: ungleich-public:9dc9daa1e089fdd14d97f6ea61689cade73def3e
Branches Tags
ungleich-public:master
ungleich-public:10884-dockerify
ungleich-public:fix_refresh_data
ungleich-public:10112/mountain-range-form-change
ungleich-public:2.1
ungleich-public:1.0
ungleich-public:1.12
ungleich-public:1.11
ungleich-public:1.10
ungleich-public:1.9
ungleich-public:1.8
...
compare: ungleich-public:8e409d1a384f5e8aac3ff25e8e8cd4a1cad97254
Branches Tags
ungleich-public:master
ungleich-public:10884-dockerify
ungleich-public:fix_refresh_data
ungleich-public:10112/mountain-range-form-change
ungleich-public:2.1
ungleich-public:1.0
ungleich-public:1.12
ungleich-public:1.11
ungleich-public:1.10
ungleich-public:1.9
ungleich-public:1.8

2 commits
9dc9daa1e0 ... 8e409d1a38

Author SHA1 Message Date
Sami
8e409d1a38 space changed too < in __str__ person 2022-04-12 12:47:17 +05:00
Sami
808f1d94bb alphabatecial order for query in person admin addition for country and dept 2022-04-12 12:01:31 +05:00
2 changed files with 8 additions and 3 deletions
Show stats Expand all files Collapse all files

7
app/admin.py
View file

@ -105,6 +105,7 @@ class PersonAdmin(admin.ModelAdmin):
}), }),
) )
list_display = ['id', 'full_name', 'organization'] list_display = ['id', 'full_name', 'organization']
#autocomplete_fields = ['organization'] #autocomplete_fields = ['organization']
form = autocomplete_fields_form # adjust width of autocomplete_fields organization form = autocomplete_fields_form # adjust width of autocomplete_fields organization
@ -112,7 +113,11 @@ class PersonAdmin(admin.ModelAdmin):
ordering = ['full_name'] ordering = ['full_name']
actions = [download_csv] actions = [download_csv]
def get_field_queryset(self, db, db_field, request):
queryset = super().get_field_queryset(db, db_field, request)
if db_field.name == 'organization':
queryset = queryset.order_by('country','organisation_english')
return queryset
class ResourceKeywordInline(admin.TabularInline): class ResourceKeywordInline(admin.TabularInline):
autocomplete_fields = ['keyword'] autocomplete_fields = ['keyword']
model = ResourceKeyword model = ResourceKeyword

4
app/models.py
View file

@ -426,11 +426,11 @@ class Organisation(models.Model):
if self.organisation_english: if self.organisation_english:
if self.organisation_2: if self.organisation_2:
name = f"{self.organisation_english} ({self.organisation_2})" name = f"{self.organisation_english} ({self.organisation_2})"
name = f"{self.country}-{self.organisation_english}-{self.organisation_2}-{self.organisation_3}-{self.acronym}" name = f"{self.country} < {self.organisation_english} < {self.organisation_2} < {self.organisation_3} < {self.acronym}"
else: else:
name = f"{self.organisation_english}" name = f"{self.organisation_english}"
name = f"{self.country}-{self.organisation_english}-{self.organisation_2}-{self.organisation_3}-{self.acronym}" name = f"{self.country} < {self.organisation_english} < {self.organisation_2} < {self.organisation_3} < {self.acronym}"
else: else: