Merge pull request #1957 from laws-africa/ratifications

Ratifications fixes

africanlii/admin.py

@@ -1,6 +1,7 @@
 from countries_plus.models import Country
 from django.contrib import admin
 
+from africanlii.forms import RatificationForm
 from africanlii.models import (
     AfricanUnionInstitution,
     AfricanUnionOrgan,
@@ -26,6 +27,7 @@ def formfield_for_foreignkey(self, db_field, request, **kwargs):
 @admin.register(Ratification)
 class RatificationAdmin(ImportExportMixin, admin.ModelAdmin):
     inlines = (RatificationCountryAdmin,)
+    form = RatificationForm
     resource_class = RatificationResource
 
 

africanlii/forms.py

@@ -1,3 +1,7 @@
+from dal import autocomplete
+from django import forms
+
+from africanlii.models import Ratification
 from peachjam.forms import BaseDocumentFilterForm
 
 
@@ -52,3 +56,10 @@ def filter_faceted_search(self, search):
             search.add_filter("jurisdiction", jurisdictions)
 
         return search
+
+
+class RatificationForm(forms.ModelForm):
+    class Meta:
+        model = Ratification
+        fields = "__all__"
+        widgets = {"work": autocomplete.ModelSelect2(url="autocomplete-works")}

africanlii/templates/africanlii/au_institution_detail.html

@@ -30,6 +30,3 @@
   {{ block.super }}
   {% include 'peachjam/_years_list.html' with showallyears=True %}
 {% endblock %}
-{% block content %}
-  {% include 'peachjam/_document_table.html' %}
-{% endblock %}

africanlii/templates/africanlii/member_state_detail.html

@@ -28,10 +28,9 @@
 {% block page-title %}<h1 class="mt-4">{{ member_state }}</h1>{% endblock %}
 {% block page-header %}
   {{ block.super }}
-  <div class="mb-3">{% include 'africanlii/_lii_info.html' %}</div>
+  <div class="mb-5">{% include 'africanlii/_lii_info.html' %}</div>
 {% endblock %}
-{% block page-list-facets %}{% endblock %}
-{% block content %}
+{% block document-table %}
   {% if ratification_countries %}
     {% include 'africanlii/_ratification_table.html' %}
   {% else %}

peachjam/templates/peachjam/layouts/document_list.html

@@ -17,7 +17,9 @@ <h1 class="mt-4">{% trans 'Documents' %}</h1>
     {% endblock %}
     {% block alerts %}{% endblock %}
     {% block nav-tabs %}{% endblock %}
-    {% include "peachjam/_document_table_form.html" %}
+    {% block document-table %}
+      {% include "peachjam/_document_table_form.html" %}
+    {% endblock %}
     {% block taxonomy-json %}{% endblock %}
   </div>
 {% endblock %}