From 91b6b9f93cf7a66a8a161d06fea6de1834ff8635 Mon Sep 17 00:00:00 2001 From: nickmwangemi Date: Wed, 2 Aug 2023 22:54:23 +0300 Subject: [PATCH 01/11] Show LII for an AU member state --- africanlii/context_processors.py | 90 +++++++++++++++++++ .../templates/africanlii/_lii_info.html | 6 ++ .../templates/africanlii/au_detail_page.html | 29 +++--- .../africanlii/member_state_detail.html | 1 + africanlii/views/au.py | 5 ++ africanlii/views/home.py | 89 +----------------- 6 files changed, 123 insertions(+), 97 deletions(-) create mode 100644 africanlii/context_processors.py create mode 100644 africanlii/templates/africanlii/_lii_info.html diff --git a/africanlii/context_processors.py b/africanlii/context_processors.py new file mode 100644 index 000000000..45fba70d0 --- /dev/null +++ b/africanlii/context_processors.py @@ -0,0 +1,90 @@ +LIIS = [ + { + "name": "EswatiniLII", + "country": "Eswatini", + "url": "https://eswatinilii.org", + "logo": "images/liis/eswatinilii.png", + }, + { + "name": "GhaLII", + "country": "Ghana", + "url": "https://ghalii.org", + "logo": "images/liis/ghalii.png", + }, + { + "name": "Kenya Law", + "country": "Kenya", + "url": "http://kenyalaw.org", + "logo": "images/liis/kenyalaw.png", + }, + { + "name": "LesothoLII", + "country": "Lesotho", + "url": "https://lesotholii.org", + "logo": "images/liis/lesotholii.png", + }, + { + "name": "MalawiLII", + "country": "Malawi", + "url": "https://malawilii.org", + "logo": "images/liis/malawilii.png", + }, + { + "name": "NamibLII", + "country": "Namibia", + "url": "https://namiblii.org", + "logo": "images/liis/namiblii.png", + }, + { + "name": "SierraLII", + "country": "Sierra Leone", + "url": "https://sierralii.org", + "logo": "images/liis/sierralii.png", + }, + { + "name": "SeyLII", + "country": "Seychelles", + "url": "https://seylii.org", + "logo": "images/liis/seylii.png", + }, + { + "name": "LawLibrary", + "country": "South Africa", + "url": "https://lawlibrary.org.za", + "logo": "images/liis/lawlibrary.png", + }, + { + "name": "TanzLII", + "country": "Tanzania", + "url": "https://tanzlii.org", + "logo": "images/liis/tanzlii.png", + }, + { + "name": "ULII", + "country": "Uganda", + "url": "https://ulii.org", + "logo": "images/liis/ulii.png", + }, + { + "name": "ZambiaLII", + "country": "Zambia", + "url": "https://zambialii.org", + "logo": "images/liis/zambialii.png", + }, + { + "name": "ZanzibarLII", + "country": "Zanzibar", + "url": "https://zanzibarlii.org", + "logo": "images/liis/zanzibarlii.png", + }, + { + "name": "ZimLII", + "country": "Zimbabwe", + "url": "https://zimlii.org", + "logo": "images/liis/zimlii.png", + }, +] + + +def show_liis(request): + return LIIS diff --git a/africanlii/templates/africanlii/_lii_info.html b/africanlii/templates/africanlii/_lii_info.html new file mode 100644 index 000000000..ff27f699c --- /dev/null +++ b/africanlii/templates/africanlii/_lii_info.html @@ -0,0 +1,6 @@ +{% for lii in liis %} + {% if lii.country == member_state.country.name %} +
{{ lii.name }}
+ {{ lii.domain }} + {% endif %} +{% endfor %} diff --git a/africanlii/templates/africanlii/au_detail_page.html b/africanlii/templates/africanlii/au_detail_page.html index 0b64ae91e..7aaf5be63 100644 --- a/africanlii/templates/africanlii/au_detail_page.html +++ b/africanlii/templates/africanlii/au_detail_page.html @@ -1,5 +1,5 @@ {% extends "peachjam/layouts/main.html" %} -{% load i18n %} +{% load static i18n %} {% block title %} {% trans 'African Union (AU)' %} {% endblock %} @@ -75,16 +75,23 @@

{% trans 'African Union
-
-

{% trans 'Member States' %}

- -
+

{% trans 'Member States' %}

+ {% for member_state in member_states %} +
+
+
+ {{ member_state.name }} +
+ {{ member_state.country }} +
+ {% include 'africanlii/_lii_info.html' %} +
+
+
+ {% endfor %}
{% endblock %} diff --git a/africanlii/templates/africanlii/member_state_detail.html b/africanlii/templates/africanlii/member_state_detail.html index d7208b13c..6f0c99c6a 100644 --- a/africanlii/templates/africanlii/member_state_detail.html +++ b/africanlii/templates/africanlii/member_state_detail.html @@ -27,6 +27,7 @@ {% endblock %} {% block page-header %}

{{ member_state }}

+ {% include 'africanlii/_lii_info.html' %} {% include 'peachjam/_document_count.html' %} {% endblock %} {% block page-list-facets %}{% endblock %} diff --git a/africanlii/views/au.py b/africanlii/views/au.py index cc894e2bd..f38d413fb 100644 --- a/africanlii/views/au.py +++ b/africanlii/views/au.py @@ -1,6 +1,7 @@ from django.shortcuts import get_object_or_404 from django.views.generic import DetailView, TemplateView +from africanlii.context_processors import show_liis from africanlii.models import ( AfricanUnionInstitution, AfricanUnionOrgan, @@ -27,6 +28,7 @@ def get_context_data(self, **kwargs): context["au_institutions"] = AfricanUnionInstitution.objects.prefetch_related( "author" ) + context["liis"] = show_liis(self.request) return context @@ -67,5 +69,8 @@ def get_context_data(self, **kwargs): country=self.get_object().country ) context["doc_count"] = ratification_countries.count() + context["liis"] = show_liis(self.request) + for lii in context["liis"]: + lii["domain"] = lii["url"].split("/", 3)[2] return context diff --git a/africanlii/views/home.py b/africanlii/views/home.py index 0dca03faa..2dca9c744 100644 --- a/africanlii/views/home.py +++ b/africanlii/views/home.py @@ -1,5 +1,6 @@ from django.utils.translation import get_language_from_request +from africanlii.context_processors import show_liis from africanlii.models import ( AfricanUnionInstitution, AfricanUnionOrgan, @@ -39,92 +40,8 @@ def get_context_data(self, **kwargs): context["taxonomies"] = Taxonomy.get_tree() context["court_classes"] = CourtClass.objects.prefetch_related("courts") - context["liis"] = [ - { - "name": "EswatiniLII", - "country": "Eswatini", - "url": "https://eswatinilii.org", - "logo": "images/liis/eswatinilii.png", - }, - { - "name": "GhaLII", - "country": "Ghana", - "url": "https://ghalii.org", - "logo": "images/liis/ghalii.png", - }, - { - "name": "Kenya Law", - "country": "Kenya", - "url": "http://kenyalaw.org", - "logo": "images/liis/kenyalaw.png", - }, - { - "name": "LesothoLII", - "country": "Lesotho", - "url": "https://lesotholii.org", - "logo": "images/liis/lesotholii.png", - }, - { - "name": "MalawiLII", - "country": "Malawi", - "url": "https://malawilii.org", - "logo": "images/liis/malawilii.png", - }, - { - "name": "NamibLII", - "country": "Namibia", - "url": "https://namiblii.org", - "logo": "images/liis/namiblii.png", - }, - { - "name": "SierraLII", - "country": "Sierra Leone", - "url": "https://sierralii.org", - "logo": "images/liis/sierralii.png", - }, - { - "name": "SeyLII", - "country": "Seychelles", - "url": "https://seylii.org", - "logo": "images/liis/seylii.png", - }, - { - "name": "LawLibrary", - "country": "South Africa", - "url": "https://lawlibrary.org.za", - "logo": "images/liis/lawlibrary.png", - }, - { - "name": "TanzLII", - "country": "Tanzania", - "url": "https://tanzlii.org", - "logo": "images/liis/tanzlii.png", - }, - { - "name": "ULII", - "country": "Uganda", - "url": "https://ulii.org", - "logo": "images/liis/ulii.png", - }, - { - "name": "ZambiaLII", - "country": "Zambia", - "url": "https://zambialii.org", - "logo": "images/liis/zambialii.png", - }, - { - "name": "ZanzibarLII", - "country": "Zanzibar", - "url": "https://zanzibarlii.org", - "logo": "images/liis/zanzibarlii.png", - }, - { - "name": "ZimLII", - "country": "Zimbabwe", - "url": "https://zimlii.org", - "logo": "images/liis/zimlii.png", - }, - ] + context["liis"] = show_liis(self.request) + for lii in context["liis"]: lii["domain"] = lii["url"].split("/", 3)[2] From 127ae8d20973d960b01858144aabb43541fe3f36 Mon Sep 17 00:00:00 2001 From: Nick Mwangemi Date: Tue, 8 Aug 2023 02:55:10 -0400 Subject: [PATCH 02/11] Update africanlii/templates/africanlii/au_detail_page.html Co-authored-by: Greg Kempe --- .../{context_processors.py => constants.py} | 18 ++++++++++++++---- africanlii/templates/africanlii/_lii_info.html | 14 ++++++++++---- .../templates/africanlii/au_detail_page.html | 2 +- africanlii/views/au.py | 8 +++----- africanlii/views/home.py | 7 ++----- 5 files changed, 30 insertions(+), 19 deletions(-) rename africanlii/{context_processors.py => constants.py} (81%) diff --git a/africanlii/context_processors.py b/africanlii/constants.py similarity index 81% rename from africanlii/context_processors.py rename to africanlii/constants.py index 45fba70d0..8e01c692b 100644 --- a/africanlii/context_processors.py +++ b/africanlii/constants.py @@ -4,87 +4,97 @@ "country": "Eswatini", "url": "https://eswatinilii.org", "logo": "images/liis/eswatinilii.png", + "domain": "eswatinilii.org", }, { "name": "GhaLII", "country": "Ghana", "url": "https://ghalii.org", "logo": "images/liis/ghalii.png", + "domain": "ghalii.org", }, { "name": "Kenya Law", "country": "Kenya", "url": "http://kenyalaw.org", "logo": "images/liis/kenyalaw.png", + "domain": "kenyalaw.org", }, { "name": "LesothoLII", "country": "Lesotho", "url": "https://lesotholii.org", "logo": "images/liis/lesotholii.png", + "domain": "lesotholii.org", }, { "name": "MalawiLII", "country": "Malawi", "url": "https://malawilii.org", "logo": "images/liis/malawilii.png", + "domain": "malawilii.org", }, { "name": "NamibLII", "country": "Namibia", "url": "https://namiblii.org", "logo": "images/liis/namiblii.png", + "domain": "namiblii.org", }, { "name": "SierraLII", "country": "Sierra Leone", "url": "https://sierralii.org", "logo": "images/liis/sierralii.png", + "domain": "sierralii.org", }, { "name": "SeyLII", "country": "Seychelles", "url": "https://seylii.org", "logo": "images/liis/seylii.png", + "domain": "seylii.org", }, { "name": "LawLibrary", "country": "South Africa", "url": "https://lawlibrary.org.za", "logo": "images/liis/lawlibrary.png", + "domain": "lawlibrary.org.za", }, { "name": "TanzLII", "country": "Tanzania", "url": "https://tanzlii.org", "logo": "images/liis/tanzlii.png", + "domain": "tanzlii.org", }, { "name": "ULII", "country": "Uganda", "url": "https://ulii.org", "logo": "images/liis/ulii.png", + "domain": "ulii.org", }, { "name": "ZambiaLII", "country": "Zambia", "url": "https://zambialii.org", "logo": "images/liis/zambialii.png", + "domain": "zambialii.org", }, { "name": "ZanzibarLII", "country": "Zanzibar", "url": "https://zanzibarlii.org", "logo": "images/liis/zanzibarlii.png", + "domain": "zanzibarlii.org", }, { "name": "ZimLII", "country": "Zimbabwe", "url": "https://zimlii.org", "logo": "images/liis/zimlii.png", + "domain": "zimlii.org", }, ] - - -def show_liis(request): - return LIIS diff --git a/africanlii/templates/africanlii/_lii_info.html b/africanlii/templates/africanlii/_lii_info.html index ff27f699c..b2a335e69 100644 --- a/africanlii/templates/africanlii/_lii_info.html +++ b/africanlii/templates/africanlii/_lii_info.html @@ -1,6 +1,12 @@ +{% load i18n %} {% for lii in liis %} {% if lii.country == member_state.country.name %} -
{{ lii.name }}
- {{ lii.domain }} - {% endif %} -{% endfor %} +
+ {% blocktrans trimmed with lii_name=lii.name %} + Visit {{ lii_name }} for more legal information.
+ {% endblocktrans %} +
+ {{ lii.domain }} +
+ {% endif %} + {% endfor %} diff --git a/africanlii/templates/africanlii/au_detail_page.html b/africanlii/templates/africanlii/au_detail_page.html index 7aaf5be63..27b6cb064 100644 --- a/africanlii/templates/africanlii/au_detail_page.html +++ b/africanlii/templates/africanlii/au_detail_page.html @@ -80,7 +80,7 @@

{% trans 'Member States'
- {{ member_state.name }}
diff --git a/africanlii/views/au.py b/africanlii/views/au.py index f38d413fb..3947f569e 100644 --- a/africanlii/views/au.py +++ b/africanlii/views/au.py @@ -1,7 +1,7 @@ from django.shortcuts import get_object_or_404 from django.views.generic import DetailView, TemplateView -from africanlii.context_processors import show_liis +from africanlii.constants import LIIS from africanlii.models import ( AfricanUnionInstitution, AfricanUnionOrgan, @@ -28,7 +28,7 @@ def get_context_data(self, **kwargs): context["au_institutions"] = AfricanUnionInstitution.objects.prefetch_related( "author" ) - context["liis"] = show_liis(self.request) + context["liis"] = LIIS return context @@ -69,8 +69,6 @@ def get_context_data(self, **kwargs): country=self.get_object().country ) context["doc_count"] = ratification_countries.count() - context["liis"] = show_liis(self.request) - for lii in context["liis"]: - lii["domain"] = lii["url"].split("/", 3)[2] + context["liis"] = LIIS return context diff --git a/africanlii/views/home.py b/africanlii/views/home.py index 2dca9c744..1aed87825 100644 --- a/africanlii/views/home.py +++ b/africanlii/views/home.py @@ -1,6 +1,6 @@ from django.utils.translation import get_language_from_request -from africanlii.context_processors import show_liis +from africanlii.constants import LIIS from africanlii.models import ( AfricanUnionInstitution, AfricanUnionOrgan, @@ -40,10 +40,7 @@ def get_context_data(self, **kwargs): context["taxonomies"] = Taxonomy.get_tree() context["court_classes"] = CourtClass.objects.prefetch_related("courts") - context["liis"] = show_liis(self.request) - - for lii in context["liis"]: - lii["domain"] = lii["url"].split("/", 3)[2] + context["liis"] = LIIS # check user's preferred language current_language = get_language_from_request(self.request) From 390e52a6720ecdc49c91bc671206240bf510b74a Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Wed, 9 Aug 2023 07:53:25 +0000 Subject: [PATCH 03/11] cache language object on request for faceted pages, this can be called many times --- peachjam/helpers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/peachjam/helpers.py b/peachjam/helpers.py index d4acb1234..7b3679349 100644 --- a/peachjam/helpers.py +++ b/peachjam/helpers.py @@ -33,8 +33,11 @@ def _wrapped_view(request, *args, **kwargs): def get_language(request): """Get language from the request object and return its 3-letter language code.""" - language = get_language_from_request(request) - return Language.objects.get(iso_639_1__iexact=language).iso_639_3 + if not hasattr(request, "language"): + language = get_language_from_request(request) + # store it on the request object because it won't change + request.language = Language.objects.get(iso_639_1__iexact=language).iso_639_3 + return request.language def pdfjs_to_text(fname): From 52ab0ee9e95f8a8a95d42017d2600d24df7f06dc Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Wed, 9 Aug 2023 07:53:46 +0000 Subject: [PATCH 04/11] labels in judgment listing; move labels beneath heading --- peachjam/templates/peachjam/_judgment_table.html | 1 + peachjam/templates/peachjam/layouts/document_detail.html | 6 ++++-- peachjam/views/courts.py | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/peachjam/templates/peachjam/_judgment_table.html b/peachjam/templates/peachjam/_judgment_table.html index 9b9ddfbb5..c828fecb0 100644 --- a/peachjam/templates/peachjam/_judgment_table.html +++ b/peachjam/templates/peachjam/_judgment_table.html @@ -13,6 +13,7 @@ {{ document.title }} + {% include 'peachjam/_labels.html' with labels=document.labels.all %} {{ document.judges_string }} {{ document.date }} diff --git a/peachjam/templates/peachjam/layouts/document_detail.html b/peachjam/templates/peachjam/layouts/document_detail.html index 73e139349..8d4b11338 100644 --- a/peachjam/templates/peachjam/layouts/document_detail.html +++ b/peachjam/templates/peachjam/layouts/document_detail.html @@ -30,8 +30,10 @@ {% block breadcrumbs %}{% endblock %} {% block document-title %}
-

{{ document.title }}

- {% include 'peachjam/_labels.html' %} +
+

{{ document.title }}

+ {% include 'peachjam/_labels.html' %} +
Date: Wed, 9 Aug 2023 08:02:00 +0000 Subject: [PATCH 05/11] re-add judge lists back to court table view --- peachjam/templates/peachjam/_judgment_table.html | 8 +++++++- peachjam/templates/peachjam/layouts/document_detail.html | 5 +++-- peachjam/views/courts.py | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/peachjam/templates/peachjam/_judgment_table.html b/peachjam/templates/peachjam/_judgment_table.html index c828fecb0..325bb1873 100644 --- a/peachjam/templates/peachjam/_judgment_table.html +++ b/peachjam/templates/peachjam/_judgment_table.html @@ -15,7 +15,13 @@ {{ document.title }} {% include 'peachjam/_labels.html' with labels=document.labels.all %} - {{ document.judges_string }} + + {% for bench in document.bench.all %} + {# djlint:off #} + {{ bench.judge.name }}{% if not forloop.last %},{% endif %} + {# djlint:on #} + {% endfor %} + {{ document.date }} {% endfor %} diff --git a/peachjam/templates/peachjam/layouts/document_detail.html b/peachjam/templates/peachjam/layouts/document_detail.html index 8d4b11338..2d211bd65 100644 --- a/peachjam/templates/peachjam/layouts/document_detail.html +++ b/peachjam/templates/peachjam/layouts/document_detail.html @@ -215,8 +215,9 @@

{{ document.title }}

{% for bench in judges %} - {{ bench.judge.name }} - {% if not forloop.last %},{% endif %} + {# djlint:off #} + {{ bench.judge.name }}{% if not forloop.last %},{% endif %} + {# djlint:on #} {% endfor %}
{% endif %} diff --git a/peachjam/views/courts.py b/peachjam/views/courts.py index cf7190219..faf351486 100644 --- a/peachjam/views/courts.py +++ b/peachjam/views/courts.py @@ -15,7 +15,7 @@ class CourtDetailView(FilteredDocumentListView): model = Judgment template_name = "peachjam/court_detail.html" navbar_link = "judgments" - queryset = Judgment.objects.prefetch_related("judges", "labels") + queryset = Judgment.objects.prefetch_related("bench", "bench__judge", "labels") def get_base_queryset(self): qs = super().get_base_queryset().filter(court=self.court) From b62315a517cfbb19d616d5a32368e61dc04c11d4 Mon Sep 17 00:00:00 2001 From: nickmwangemi Date: Wed, 9 Aug 2023 16:07:32 +0300 Subject: [PATCH 06/11] Fix incorrect div --- africanlii/templates/africanlii/_lii_info.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/africanlii/templates/africanlii/_lii_info.html b/africanlii/templates/africanlii/_lii_info.html index b2a335e69..f7fc74e38 100644 --- a/africanlii/templates/africanlii/_lii_info.html +++ b/africanlii/templates/africanlii/_lii_info.html @@ -3,10 +3,11 @@ {% if lii.country == member_state.country.name %}
{% blocktrans trimmed with lii_name=lii.name %} - Visit {{ lii_name }} for more legal information.
+ Visit {{ lii_name }} for more legal information. {% endblocktrans %} - - {% endif %} - {% endfor %} +
+ + {% endif %} +{% endfor %} From 72d6ef5372b3ba3fe81a6c57dd5c2af5bf666ee3 Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Thu, 10 Aug 2023 10:50:15 +0200 Subject: [PATCH 07/11] don't show judges in court listing --- peachjam/templates/peachjam/_judgment_table.html | 8 -------- peachjam/views/courts.py | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/peachjam/templates/peachjam/_judgment_table.html b/peachjam/templates/peachjam/_judgment_table.html index 325bb1873..182769c48 100644 --- a/peachjam/templates/peachjam/_judgment_table.html +++ b/peachjam/templates/peachjam/_judgment_table.html @@ -4,7 +4,6 @@ {% trans 'Title' %} - {% trans 'Judges' %} {% trans 'Date' %} @@ -15,13 +14,6 @@ {{ document.title }} {% include 'peachjam/_labels.html' with labels=document.labels.all %} - - {% for bench in document.bench.all %} - {# djlint:off #} - {{ bench.judge.name }}{% if not forloop.last %},{% endif %} - {# djlint:on #} - {% endfor %} - {{ document.date }} {% endfor %} diff --git a/peachjam/views/courts.py b/peachjam/views/courts.py index faf351486..16b0eb81d 100644 --- a/peachjam/views/courts.py +++ b/peachjam/views/courts.py @@ -15,7 +15,7 @@ class CourtDetailView(FilteredDocumentListView): model = Judgment template_name = "peachjam/court_detail.html" navbar_link = "judgments" - queryset = Judgment.objects.prefetch_related("bench", "bench__judge", "labels") + queryset = Judgment.objects.prefetch_related("labels") def get_base_queryset(self): qs = super().get_base_queryset().filter(court=self.court) From 6518d02dfc81120a62168db55af2360c88bf5a54 Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Thu, 10 Aug 2023 15:27:07 +0200 Subject: [PATCH 08/11] Fix API url, and ensure building absolute urls uses https --- peachjam/settings.py | 2 ++ peachjam_api/urls_public.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/peachjam/settings.py b/peachjam/settings.py index 6f7ad0e3d..f35b0603b 100644 --- a/peachjam/settings.py +++ b/peachjam/settings.py @@ -493,6 +493,8 @@ SESSION_ENGINE = "django.contrib.sessions.backends.signed_cookies" SESSION_COOKIE_SECURE = True +# nginx sets this header to indicate if the upstream request was secure +SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https") # Caches if DEBUG: diff --git a/peachjam_api/urls_public.py b/peachjam_api/urls_public.py index 1d2bb4e55..411279c54 100644 --- a/peachjam_api/urls_public.py +++ b/peachjam_api/urls_public.py @@ -17,5 +17,5 @@ urlpatterns = [ # public-facing API - path("v1/", include(router.urls)), + path("", include(router.urls)), ] From 3f9b640384b3cd573ebb0bad0f4b65d7a736c1bc Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Fri, 11 Aug 2023 08:52:26 +0200 Subject: [PATCH 09/11] pin django-debug-toolbar to avoid broken dependencies --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b43b0541d..68acc5322 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ dependencies = [ "django-ckeditor>=6.4.2", "django-compressor>=3.1", "django-countries-plus>=1.3.2", - "django-debug-toolbar>=3.2.4", + "django-debug-toolbar>=3.2.4,<4.2.0", "django-elasticsearch-debug-toolbar>=3.0.2", "django-elasticsearch-dsl>=7.2.2", "django-elasticsearch-dsl-drf>=0.22.4", From 6fa0281f83e24f696c32b936a7d547486c587ebc Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Fri, 11 Aug 2023 12:41:58 +0200 Subject: [PATCH 10/11] add missing migration --- peachjam/migrations/0094_api_perms.py | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 peachjam/migrations/0094_api_perms.py diff --git a/peachjam/migrations/0094_api_perms.py b/peachjam/migrations/0094_api_perms.py new file mode 100644 index 000000000..d245f6abb --- /dev/null +++ b/peachjam/migrations/0094_api_perms.py @@ -0,0 +1,32 @@ +# Generated by Django 3.2.20 on 2023-08-03 14:17 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("peachjam", "0093_add_model_labels"), + ] + + operations = [ + migrations.AlterModelOptions( + name="gazette", + options={ + "base_manager_name": "objects", + "permissions": [("api_gazette", "API gazette access")], + "verbose_name": "gazette", + "verbose_name_plural": "gazettes", + }, + ), + migrations.AlterModelOptions( + name="judgment", + options={ + "base_manager_name": "objects", + "ordering": ["title"], + "permissions": [("api_judgment", "API judgment access")], + "verbose_name": "judgment", + "verbose_name_plural": "judgments", + }, + ), + ] From bf105ade3d4c5aacdbaf610998499accddd01276 Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Fri, 11 Aug 2023 12:47:11 +0200 Subject: [PATCH 11/11] adjust migrations --- peachjam/migrations/{0094_api_perms.py => 0095_api_perms.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename peachjam/migrations/{0094_api_perms.py => 0095_api_perms.py} (94%) diff --git a/peachjam/migrations/0094_api_perms.py b/peachjam/migrations/0095_api_perms.py similarity index 94% rename from peachjam/migrations/0094_api_perms.py rename to peachjam/migrations/0095_api_perms.py index d245f6abb..a6158d6c1 100644 --- a/peachjam/migrations/0094_api_perms.py +++ b/peachjam/migrations/0095_api_perms.py @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ("peachjam", "0093_add_model_labels"), + ("peachjam", "0094_alter_judge_options"), ] operations = [