From 7e387ddcde27629ddcc4afaeee8ee8f913e21690 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Thu, 26 Sep 2019 06:04:30 +0200
Subject: [PATCH] Improve journals pages (breadcrumbs etc)
---
.../migrations/0011_auto_20190926_0603.py | 18 +++++++++++++++
.../migrations/0080_auto_20190926_0520.py | 22 ++++++++++++++++++
.../migrations/0081_auto_20190926_0603.py | 23 +++++++++++++++++++
journals/models/journal.py | 4 ++++
journals/templates/journals/about.html | 2 ++
journals/templates/journals/authoring.html | 3 +++
.../journals/journal_landing_page.html | 3 +++
journals/templates/journals/journal_list.html | 17 ++++++++++++++
journals/templates/journals/refereeing.html | 3 +++
.../migrations/0027_auto_20190926_0603.py | 18 +++++++++++++++
scipost/constants.py | 2 +-
scipost/migrations/0031_auto_20190926_0603.py | 18 +++++++++++++++
.../migrations/0064_auto_20190926_0603.py | 18 +++++++++++++++
theses/migrations/0008_auto_20190926_0603.py | 18 +++++++++++++++
14 files changed, 168 insertions(+), 1 deletion(-)
create mode 100644 commentaries/migrations/0011_auto_20190926_0603.py
create mode 100644 journals/migrations/0080_auto_20190926_0520.py
create mode 100644 journals/migrations/0081_auto_20190926_0603.py
create mode 100644 profiles/migrations/0027_auto_20190926_0603.py
create mode 100644 scipost/migrations/0031_auto_20190926_0603.py
create mode 100644 submissions/migrations/0064_auto_20190926_0603.py
create mode 100644 theses/migrations/0008_auto_20190926_0603.py
diff --git a/commentaries/migrations/0011_auto_20190926_0603.py b/commentaries/migrations/0011_auto_20190926_0603.py
new file mode 100644
index 000000000..26be69185
--- /dev/null
+++ b/commentaries/migrations/0011_auto_20190926_0603.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1.8 on 2019-09-26 04:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('commentaries', '0010_auto_20190925_1450'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='commentary',
+ name='discipline',
+ field=models.CharField(choices=[('Multidisciplinary', (('multidisciplinary', 'Multidisciplinary'),)), ('Formal Sciences', (('mathematics', 'Mathematics'), ('computerscience', 'Computer Science'))), ('Natural Sciences', (('physics', 'Physics'), ('astronomy', 'Astronomy'), ('astrophysics', 'Astrophysics'), ('biology', 'Biology'), ('chemistry', 'Chemistry'), ('earthscience', 'Earth and Environmental Sciences'))), ('Engineering', (('civileng', 'Civil Engineering'), ('electricaleng', 'Electrical Engineering'), ('mechanicaleng', 'Mechanical Engineering'), ('chemicaleng', 'Chemical Engineering'), ('materialseng', 'Materials Engineering'), ('medicaleng', 'Medical Engineering'), ('environmentaleng', 'Environmental Engineering'), ('industrialeng', 'Industrial Engineering'))), ('Medical Sciences', (('medicine', 'Basic Medicine'), ('clinical', 'Clinical Medicine'), ('health', 'Health Sciences'))), ('Agricultural Sciences', (('agricultural', 'Agriculture, Forestry and Fisheries'), ('veterinary', 'Veterinary Science'))), ('Social Sciences', (('economics', 'Economics'), ('geography', 'Geography'), ('law', 'Law'), ('media', 'Media and Communications'), ('pedagogy', 'Pedagogy and Educational Sciences'), ('politicalscience', 'Political Science'), ('psychology', 'Psychology'), ('sociology', 'Sociology'))), ('Humanities', (('art', 'Art (arts, history or arts, performing arts, music)'), ('history', 'History and Archeology'), ('literature', 'Language and Literature'), ('philosophy', 'Philosophy, Ethics and Religion')))], default='physics', max_length=20),
+ ),
+ ]
diff --git a/journals/migrations/0080_auto_20190926_0520.py b/journals/migrations/0080_auto_20190926_0520.py
new file mode 100644
index 000000000..e5e1b0c23
--- /dev/null
+++ b/journals/migrations/0080_auto_20190926_0520.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.1.8 on 2019-09-26 03:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0079_auto_20190925_1450'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='journal',
+ options={'ordering': ['discipline', 'list_order']},
+ ),
+ migrations.AddField(
+ model_name='journal',
+ name='list_order',
+ field=models.PositiveSmallIntegerField(default=100),
+ ),
+ ]
diff --git a/journals/migrations/0081_auto_20190926_0603.py b/journals/migrations/0081_auto_20190926_0603.py
new file mode 100644
index 000000000..26f267ef3
--- /dev/null
+++ b/journals/migrations/0081_auto_20190926_0603.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.1.8 on 2019-09-26 04:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('journals', '0080_auto_20190926_0520'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='journal',
+ name='discipline',
+ field=models.CharField(choices=[('Multidisciplinary', (('multidisciplinary', 'Multidisciplinary'),)), ('Formal Sciences', (('mathematics', 'Mathematics'), ('computerscience', 'Computer Science'))), ('Natural Sciences', (('physics', 'Physics'), ('astronomy', 'Astronomy'), ('astrophysics', 'Astrophysics'), ('biology', 'Biology'), ('chemistry', 'Chemistry'), ('earthscience', 'Earth and Environmental Sciences'))), ('Engineering', (('civileng', 'Civil Engineering'), ('electricaleng', 'Electrical Engineering'), ('mechanicaleng', 'Mechanical Engineering'), ('chemicaleng', 'Chemical Engineering'), ('materialseng', 'Materials Engineering'), ('medicaleng', 'Medical Engineering'), ('environmentaleng', 'Environmental Engineering'), ('industrialeng', 'Industrial Engineering'))), ('Medical Sciences', (('medicine', 'Basic Medicine'), ('clinical', 'Clinical Medicine'), ('health', 'Health Sciences'))), ('Agricultural Sciences', (('agricultural', 'Agriculture, Forestry and Fisheries'), ('veterinary', 'Veterinary Science'))), ('Social Sciences', (('economics', 'Economics'), ('geography', 'Geography'), ('law', 'Law'), ('media', 'Media and Communications'), ('pedagogy', 'Pedagogy and Educational Sciences'), ('politicalscience', 'Political Science'), ('psychology', 'Psychology'), ('sociology', 'Sociology'))), ('Humanities', (('art', 'Art (arts, history or arts, performing arts, music)'), ('history', 'History and Archeology'), ('literature', 'Language and Literature'), ('philosophy', 'Philosophy, Ethics and Religion')))], default='physics', max_length=20),
+ ),
+ migrations.AlterField(
+ model_name='publication',
+ name='discipline',
+ field=models.CharField(choices=[('Multidisciplinary', (('multidisciplinary', 'Multidisciplinary'),)), ('Formal Sciences', (('mathematics', 'Mathematics'), ('computerscience', 'Computer Science'))), ('Natural Sciences', (('physics', 'Physics'), ('astronomy', 'Astronomy'), ('astrophysics', 'Astrophysics'), ('biology', 'Biology'), ('chemistry', 'Chemistry'), ('earthscience', 'Earth and Environmental Sciences'))), ('Engineering', (('civileng', 'Civil Engineering'), ('electricaleng', 'Electrical Engineering'), ('mechanicaleng', 'Mechanical Engineering'), ('chemicaleng', 'Chemical Engineering'), ('materialseng', 'Materials Engineering'), ('medicaleng', 'Medical Engineering'), ('environmentaleng', 'Environmental Engineering'), ('industrialeng', 'Industrial Engineering'))), ('Medical Sciences', (('medicine', 'Basic Medicine'), ('clinical', 'Clinical Medicine'), ('health', 'Health Sciences'))), ('Agricultural Sciences', (('agricultural', 'Agriculture, Forestry and Fisheries'), ('veterinary', 'Veterinary Science'))), ('Social Sciences', (('economics', 'Economics'), ('geography', 'Geography'), ('law', 'Law'), ('media', 'Media and Communications'), ('pedagogy', 'Pedagogy and Educational Sciences'), ('politicalscience', 'Political Science'), ('psychology', 'Psychology'), ('sociology', 'Sociology'))), ('Humanities', (('art', 'Art (arts, history or arts, performing arts, music)'), ('history', 'History and Archeology'), ('literature', 'Language and Literature'), ('philosophy', 'Philosophy, Ethics and Religion')))], default='physics', max_length=20),
+ ),
+ ]
diff --git a/journals/models/journal.py b/journals/models/journal.py
index 0dd3b23b6..f466fd170 100644
--- a/journals/models/journal.py
+++ b/journals/models/journal.py
@@ -39,6 +39,7 @@ class Journal(models.Model):
# For Journals list page
blurb = models.TextField(default='[To be filled in; you can use markup]')
+ list_order = models.PositiveSmallIntegerField(default=100)
# For about page:
description = models.TextField(default='[To be filled in; you can use markup]')
scope = models.TextField(default='[To be filled in; you can use markup]')
@@ -55,6 +56,9 @@ class Journal(models.Model):
objects = JournalQuerySet.as_manager()
+ class Meta:
+ ordering = ['discipline', 'list_order']
+
def __str__(self):
return self.name
diff --git a/journals/templates/journals/about.html b/journals/templates/journals/about.html
index f443a4bc5..6f0dae719 100644
--- a/journals/templates/journals/about.html
+++ b/journals/templates/journals/about.html
@@ -1,11 +1,13 @@
{% extends 'journals/base.html' %}
{% load automarkup %}
+{% load scipost_extras %}
{% block pagetitle %}{{block.super}}: About {{ journal.name }}{% endblock pagetitle %}
{% block breadcrumb_items %}
{{ block.super }}
+ <a href="{% url 'journals:journals' discipline=journal.discipline %}" class="breadcrumb-item">{{ journal.discipline|get_discipline_display }} Journals</a>
<a href="{% url 'journal:issues' journal.doi_label %}" class="breadcrumb-item">{{ journal.name }}</a>
<span class="breadcrumb-item active">About</span>
{% endblock %}
diff --git a/journals/templates/journals/authoring.html b/journals/templates/journals/authoring.html
index bb6406c12..b66911861 100644
--- a/journals/templates/journals/authoring.html
+++ b/journals/templates/journals/authoring.html
@@ -1,5 +1,7 @@
{% extends 'journals/base.html' %}
+{% load scipost_extras %}
+
{% block pagetitle %}{{block.super}}: Authoring guidelines{% endblock pagetitle %}
{% block link_class_physics_info %}active{% endblock %}
@@ -7,6 +9,7 @@
{% block breadcrumb_items %}
{{ block.super }}
{% if journal %}
+ <a href="{% url 'journals:journals' discipline=journal.discipline %}" class="breadcrumb-item">{{ journal.discipline|get_discipline_display }} Journals</a>
<a href="{% url 'journal:about' journal.doi_label %}" class="breadcrumb-item">{{ journal.name }}</a>
{% endif %}
<span class="breadcrumb-item active">Authoring guidelines</span>
diff --git a/journals/templates/journals/journal_landing_page.html b/journals/templates/journals/journal_landing_page.html
index 1b5a74911..6f42c7d67 100644
--- a/journals/templates/journals/journal_landing_page.html
+++ b/journals/templates/journals/journal_landing_page.html
@@ -1,7 +1,10 @@
{% extends 'journals/base.html' %}
+{% load scipost_extras %}
+
{% block breadcrumb_items %}
{{block.super}}
+ <a href="{% url 'journals:journals' discipline=journal.discipline %}" class="breadcrumb-item">{{ journal.discipline|get_discipline_display }} Journals</a>
<a href="{{ journal.get_absolute_url }}" class="breadcrumb-item">{{ journal }}</a>
<span class="breadcrumb-item">Home</span>
{% endblock %}
diff --git a/journals/templates/journals/journal_list.html b/journals/templates/journals/journal_list.html
index 7d1bd18dd..776aa0ee5 100644
--- a/journals/templates/journals/journal_list.html
+++ b/journals/templates/journals/journal_list.html
@@ -11,6 +11,23 @@
{% block pagetitle %}: Journals{% if discipline %} in {{ discipline|get_discipline_display }}{% endif %}{% endblock pagetitle %}
+{% block breadcrumb %}
+ <div class="breadcrumb-container">
+ <div class="container">
+ <nav class="breadcrumb hidden-sm-down">
+ {% block breadcrumb_items %}
+ {% if discipline %}
+ <a href="{% url 'journals:journals' %}" class="breadcrumb-item">Journals</a>
+ <span class="breadcrumb-item">{{ discipline|get_discipline_display }} Journals</span>
+ {% else %}
+ <span class="breadcrumb-item">Journals</span>
+ {% endif %}
+ {% endblock %}
+ </nav>
+ </div>
+ </div>
+{% endblock %}
+
{% block content %}
diff --git a/journals/templates/journals/refereeing.html b/journals/templates/journals/refereeing.html
index e4d81bef4..f5d407d78 100644
--- a/journals/templates/journals/refereeing.html
+++ b/journals/templates/journals/refereeing.html
@@ -1,5 +1,7 @@
{% extends 'journals/base.html' %}
+{% load scipost_extras %}
+
{% block pagetitle %}{{block.super}}: Refereeing guidelines{% endblock pagetitle %}
{% block link_class_physics_info %}active{% endblock %}
@@ -7,6 +9,7 @@
{% block breadcrumb_items %}
{{ block.super }}
{% if journal %}
+ <a href="{% url 'journals:journals' discipline=journal.discipline %}" class="breadcrumb-item">{{ journal.discipline|get_discipline_display }} Journals</a>
<a href="{% url 'journal:about' journal.doi_label %}" class="breadcrumb-item">{{ journal.name }}</a>
{% endif %}
<span class="breadcrumb-item active">Refereeing guidelines</span>
diff --git a/profiles/migrations/0027_auto_20190926_0603.py b/profiles/migrations/0027_auto_20190926_0603.py
new file mode 100644
index 000000000..e7c9c52ce
--- /dev/null
+++ b/profiles/migrations/0027_auto_20190926_0603.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1.8 on 2019-09-26 04:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('profiles', '0026_auto_20190925_1450'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='profile',
+ name='discipline',
+ field=models.CharField(choices=[('Multidisciplinary', (('multidisciplinary', 'Multidisciplinary'),)), ('Formal Sciences', (('mathematics', 'Mathematics'), ('computerscience', 'Computer Science'))), ('Natural Sciences', (('physics', 'Physics'), ('astronomy', 'Astronomy'), ('astrophysics', 'Astrophysics'), ('biology', 'Biology'), ('chemistry', 'Chemistry'), ('earthscience', 'Earth and Environmental Sciences'))), ('Engineering', (('civileng', 'Civil Engineering'), ('electricaleng', 'Electrical Engineering'), ('mechanicaleng', 'Mechanical Engineering'), ('chemicaleng', 'Chemical Engineering'), ('materialseng', 'Materials Engineering'), ('medicaleng', 'Medical Engineering'), ('environmentaleng', 'Environmental Engineering'), ('industrialeng', 'Industrial Engineering'))), ('Medical Sciences', (('medicine', 'Basic Medicine'), ('clinical', 'Clinical Medicine'), ('health', 'Health Sciences'))), ('Agricultural Sciences', (('agricultural', 'Agriculture, Forestry and Fisheries'), ('veterinary', 'Veterinary Science'))), ('Social Sciences', (('economics', 'Economics'), ('geography', 'Geography'), ('law', 'Law'), ('media', 'Media and Communications'), ('pedagogy', 'Pedagogy and Educational Sciences'), ('politicalscience', 'Political Science'), ('psychology', 'Psychology'), ('sociology', 'Sociology'))), ('Humanities', (('art', 'Art (arts, history or arts, performing arts, music)'), ('history', 'History and Archeology'), ('literature', 'Language and Literature'), ('philosophy', 'Philosophy, Ethics and Religion')))], default='physics', max_length=20, verbose_name='Main discipline'),
+ ),
+ ]
diff --git a/scipost/constants.py b/scipost/constants.py
index 6cc0bf6ed..658749e81 100644
--- a/scipost/constants.py
+++ b/scipost/constants.py
@@ -59,7 +59,7 @@ DISCIPLINE_PHILOSOPHY = 'philosophy'
SCIPOST_DISCIPLINES = (
('Multidisciplinary',
(
- (DISCIPLINE_MULTI_ALL, 'Multidisciplinary (any combination)'),
+ (DISCIPLINE_MULTI_ALL, 'Multidisciplinary'),
# (DISCIPLINE_MULTI_FORMAL, 'Multidisciplinary (within Formal Sciences)'),
# (DISCIPLINE_MULTI_NATURAL, 'Multidisciplinary (within Natural Sciences)'),
# (DISCIPLINE_ENGINEERING_MULTI, 'Multidisciplinary (within Engineering and Technology)'),
diff --git a/scipost/migrations/0031_auto_20190926_0603.py b/scipost/migrations/0031_auto_20190926_0603.py
new file mode 100644
index 000000000..90526bd14
--- /dev/null
+++ b/scipost/migrations/0031_auto_20190926_0603.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1.8 on 2019-09-26 04:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('scipost', '0030_auto_20190925_1450'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='contributor',
+ name='discipline',
+ field=models.CharField(choices=[('Multidisciplinary', (('multidisciplinary', 'Multidisciplinary'),)), ('Formal Sciences', (('mathematics', 'Mathematics'), ('computerscience', 'Computer Science'))), ('Natural Sciences', (('physics', 'Physics'), ('astronomy', 'Astronomy'), ('astrophysics', 'Astrophysics'), ('biology', 'Biology'), ('chemistry', 'Chemistry'), ('earthscience', 'Earth and Environmental Sciences'))), ('Engineering', (('civileng', 'Civil Engineering'), ('electricaleng', 'Electrical Engineering'), ('mechanicaleng', 'Mechanical Engineering'), ('chemicaleng', 'Chemical Engineering'), ('materialseng', 'Materials Engineering'), ('medicaleng', 'Medical Engineering'), ('environmentaleng', 'Environmental Engineering'), ('industrialeng', 'Industrial Engineering'))), ('Medical Sciences', (('medicine', 'Basic Medicine'), ('clinical', 'Clinical Medicine'), ('health', 'Health Sciences'))), ('Agricultural Sciences', (('agricultural', 'Agriculture, Forestry and Fisheries'), ('veterinary', 'Veterinary Science'))), ('Social Sciences', (('economics', 'Economics'), ('geography', 'Geography'), ('law', 'Law'), ('media', 'Media and Communications'), ('pedagogy', 'Pedagogy and Educational Sciences'), ('politicalscience', 'Political Science'), ('psychology', 'Psychology'), ('sociology', 'Sociology'))), ('Humanities', (('art', 'Art (arts, history or arts, performing arts, music)'), ('history', 'History and Archeology'), ('literature', 'Language and Literature'), ('philosophy', 'Philosophy, Ethics and Religion')))], default='physics', max_length=20, verbose_name='Main discipline'),
+ ),
+ ]
diff --git a/submissions/migrations/0064_auto_20190926_0603.py b/submissions/migrations/0064_auto_20190926_0603.py
new file mode 100644
index 000000000..00e8db6be
--- /dev/null
+++ b/submissions/migrations/0064_auto_20190926_0603.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1.8 on 2019-09-26 04:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('submissions', '0063_auto_20190925_1450'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='submission',
+ name='discipline',
+ field=models.CharField(choices=[('Multidisciplinary', (('multidisciplinary', 'Multidisciplinary'),)), ('Formal Sciences', (('mathematics', 'Mathematics'), ('computerscience', 'Computer Science'))), ('Natural Sciences', (('physics', 'Physics'), ('astronomy', 'Astronomy'), ('astrophysics', 'Astrophysics'), ('biology', 'Biology'), ('chemistry', 'Chemistry'), ('earthscience', 'Earth and Environmental Sciences'))), ('Engineering', (('civileng', 'Civil Engineering'), ('electricaleng', 'Electrical Engineering'), ('mechanicaleng', 'Mechanical Engineering'), ('chemicaleng', 'Chemical Engineering'), ('materialseng', 'Materials Engineering'), ('medicaleng', 'Medical Engineering'), ('environmentaleng', 'Environmental Engineering'), ('industrialeng', 'Industrial Engineering'))), ('Medical Sciences', (('medicine', 'Basic Medicine'), ('clinical', 'Clinical Medicine'), ('health', 'Health Sciences'))), ('Agricultural Sciences', (('agricultural', 'Agriculture, Forestry and Fisheries'), ('veterinary', 'Veterinary Science'))), ('Social Sciences', (('economics', 'Economics'), ('geography', 'Geography'), ('law', 'Law'), ('media', 'Media and Communications'), ('pedagogy', 'Pedagogy and Educational Sciences'), ('politicalscience', 'Political Science'), ('psychology', 'Psychology'), ('sociology', 'Sociology'))), ('Humanities', (('art', 'Art (arts, history or arts, performing arts, music)'), ('history', 'History and Archeology'), ('literature', 'Language and Literature'), ('philosophy', 'Philosophy, Ethics and Religion')))], default='physics', max_length=20),
+ ),
+ ]
diff --git a/theses/migrations/0008_auto_20190926_0603.py b/theses/migrations/0008_auto_20190926_0603.py
new file mode 100644
index 000000000..337954ea5
--- /dev/null
+++ b/theses/migrations/0008_auto_20190926_0603.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.1.8 on 2019-09-26 04:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('theses', '0007_auto_20190925_1450'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='thesislink',
+ name='discipline',
+ field=models.CharField(choices=[('Multidisciplinary', (('multidisciplinary', 'Multidisciplinary'),)), ('Formal Sciences', (('mathematics', 'Mathematics'), ('computerscience', 'Computer Science'))), ('Natural Sciences', (('physics', 'Physics'), ('astronomy', 'Astronomy'), ('astrophysics', 'Astrophysics'), ('biology', 'Biology'), ('chemistry', 'Chemistry'), ('earthscience', 'Earth and Environmental Sciences'))), ('Engineering', (('civileng', 'Civil Engineering'), ('electricaleng', 'Electrical Engineering'), ('mechanicaleng', 'Mechanical Engineering'), ('chemicaleng', 'Chemical Engineering'), ('materialseng', 'Materials Engineering'), ('medicaleng', 'Medical Engineering'), ('environmentaleng', 'Environmental Engineering'), ('industrialeng', 'Industrial Engineering'))), ('Medical Sciences', (('medicine', 'Basic Medicine'), ('clinical', 'Clinical Medicine'), ('health', 'Health Sciences'))), ('Agricultural Sciences', (('agricultural', 'Agriculture, Forestry and Fisheries'), ('veterinary', 'Veterinary Science'))), ('Social Sciences', (('economics', 'Economics'), ('geography', 'Geography'), ('law', 'Law'), ('media', 'Media and Communications'), ('pedagogy', 'Pedagogy and Educational Sciences'), ('politicalscience', 'Political Science'), ('psychology', 'Psychology'), ('sociology', 'Sociology'))), ('Humanities', (('art', 'Art (arts, history or arts, performing arts, music)'), ('history', 'History and Archeology'), ('literature', 'Language and Literature'), ('philosophy', 'Philosophy, Ethics and Religion')))], default='physics', max_length=20),
+ ),
+ ]
--
GitLab