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

Compare commits

base: ungleich-public:c483ed000ae406eb190d1263a8ad841cac21ecbb
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:6715924065b04c2116c2125ebbcc2ea533d48215
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

3 Commits
c483ed000a ... 6715924065

Author SHA1 Message Date
PCoder 6715924065 Add migrations 2022-01-17 23:56:48 +05:30
PCoder 0e5a7fb2c8 Merge remote-tracking branch 'ungleich-public/master' 2022-01-17 23:56:17 +05:30
PCoder 461ceb9573 Organization: Reorganize fields 2022-01-17 23:54:29 +05:30
2 changed files with 27 additions and 4 deletions
Show Stats Expand all files Collapse all files

8
app/admin.py
View File

@ -209,7 +209,8 @@ class OrganizationAdmin(admin.ModelAdmin):
'fields': (
'org_num1',
('acronym', 'category', 'subject'),
'organisation_english',
'country',
('organisation_english','tel', 'email', 'url',),
('organisation_2', 'organisation_3'),
'organisation_original',
)
@ -218,13 +219,12 @@ class OrganizationAdmin(admin.ModelAdmin):
'classes': ('collapse',),
'fields': (
('street', 'postcode', 'city'),
('po_box', 'country', 'lat_long'),
('po_box', 'lat_long'),
)
}),
('Other details', {
'classes': ('collapse',),
'fields': (('tel', 'email'),
'url',
'fields': (
'tags',
),
})

23
app/migrations/0057_alter_person_mr_mrs_alter_resource_type.py Normal file
View File

@ -0,0 +1,23 @@
# Generated by Django 4.0.1 on 2022-01-17 18:26
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('app', '0056_alter_mountainrange_range_alternate_id'),
]
operations = [
migrations.AlterField(
model_name='person',
name='mr_mrs',
field=models.TextField(blank=True, choices=[('', ''), ('Ms', 'Ms'), ('Mr', 'Mr')], null=True),
),
migrations.AlterField(
model_name='resource',
name='type',
field=models.TextField(blank=True, choices=[('', ''), ('Atlas', 'Atlas'), ('Book', 'Book'), ('Book chapter', 'Book chapter'), ('Case study', 'Case study'), ('Conservation project', 'Conservation project'), ('Dataset', 'Dataset'), ('Development project', 'Development project'), ('Journal article', 'Journal article'), ('LTER', 'LTER'), ('Map', 'Map'), ('Network', 'Network'), ('PEGASuS', 'PEGASuS'), ('Presentation', 'Presentation'), ('Report', 'Report'), ('Research project', 'Research project'), ('Research Site', 'Research Site'), ('Thesis', 'Thesis'), ('Video', 'Video'), ('Website', 'Website'), ('Working Group', 'Working Group')], null=True),
),
]