Merge pull request #42 from BirkbeckCTP/django_two_three

mauromsl · web-flow · commit 7cdd75434b43 · 2023-05-10T08:41:14.000+02:00
Plugin now runs in Django 3.2
diff --git a/apps.py b/apps.py
@@ -2,4 +2,4 @@
 
 
 class BooksConfig(AppConfig):
-    name = 'books'
+    name = 'plugins.books'
diff --git a/forms.py b/forms.py
@@ -27,7 +27,7 @@ def get_queryset(self):
         pks = [row.get('object', None).pk for row in self.items if row.get('object', None)]
         return models.Contributor.objects.filter(pk__in=pks)
 
-    def render(self, name, value, attrs=None, choices=()):
+    def render(self, name, value, attrs=None, choices=(), renderer=None):
         value_for_template = [int(val) for val in value] if value else None
         context = {
             'items': self.items,
@@ -95,6 +95,7 @@ def __init__(self, *args, **kwargs):
         items = kwargs.pop('items', None)
         super(ChapterForm, self).__init__(*args, **kwargs)
         self.fields['contributors'].widget = TableMultiSelect(items=items)
+        self.fields['contributors'].required = False
 
     file = forms.FileField(required=False)
 
diff --git a/models.py b/models.py
@@ -224,7 +224,10 @@ def remote_book_label(self):
 
 
 class Contributor(models.Model):
-    book = models.ForeignKey(Book)
+    book = models.ForeignKey(
+        Book,
+        on_delete=models.CASCADE,
+    )
     first_name = models.CharField(max_length=100)
     middle_name = models.CharField(max_length=100, blank=True, null=True)
     last_name = models.CharField(max_length=100)
@@ -254,7 +257,10 @@ def citation_name(self):
 
 
 class Format(models.Model):
-    book = models.ForeignKey(Book)
+    book = models.ForeignKey(
+        Book,
+        on_delete=models.CASCADE,
+    )
 
     title = models.CharField(max_length=100)
     filename = models.CharField(max_length=100)
@@ -318,12 +324,30 @@ def access_choices():
 
 
 class BookAccess(models.Model):
-    book = models.ForeignKey(Book)
-    chapter = models.ForeignKey('Chapter', blank=True, null=True)
+    book = models.ForeignKey(
+        Book,
+        on_delete=models.CASCADE,
+    )
+    chapter = models.ForeignKey(
+        'Chapter',
+        blank=True,
+        null=True,
+        on_delete=models.SET_NULL,
+    )
     type = models.CharField(max_length=20, choices=access_choices())
-    format = models.ForeignKey(Format, blank=True, null=True)
+    format = models.ForeignKey(
+        Format,
+        blank=True,
+        null=True,
+        on_delete=models.SET_NULL,
+    )
     accessed = models.DateTimeField(default=timezone.now)
-    country = models.ForeignKey('core.Country', null=True, blank=True)
+    country = models.ForeignKey(
+        'core.Country',
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+    )
     identifier = models.CharField(max_length=100)
 
     def __str__(self):
@@ -335,7 +359,10 @@ def __str__(self):
 
 
 class Chapter(models.Model):
-    book = models.ForeignKey(Book)
+    book = models.ForeignKey(
+        Book,
+        on_delete=models.CASCADE,
+    )
     title = models.CharField(
         max_length=255,
     )
diff --git a/templates/books/book_detail.html b/templates/books/book_detail.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static %}
 {% load i18n %}
 <div class="large-12 columns">
     <div class="content clearfix">
diff --git a/templates/books/book_epub.html b/templates/books/book_epub.html
@@ -1,4 +1,4 @@
-{% load static from staticfiles %}
+{% load static %}
 <html>
 <head>
     <title>{{ book.full_title }}</title>
diff --git a/urls.py b/urls.py
@@ -1,46 +1,46 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from plugins.books import views
 
 urlpatterns = [
-    url(r'^$', views.index, name='books_index'),
-    url(r'^category/(?P<category_slug>[-\w.]+)/$', views.index, name='books_index_category'),
-    url(r'^(?P<book_id>\d+)/$', views.view_book, name='books_book'),
-    url(r'^(?P<book_id>\d+)/format/(?P<format_id>\d+)/$', views.download_format, name='books_download_format'),
-    url(r'^(?P<book_id>\d+)/format/(?P<format_id>\d+)/mark_download/(?P<mark_download>no|yes)/$', views.download_format, name='books_download_format'),
-    url(r'^(?P<book_id>\d+)/format/(?P<format_id>\d+)/read/$', views.read_epub, name='books_read_epub'),
-    url(r'^(?P<book_id>\d+)/chapter/(?P<chapter_id>\d+)$',
+    re_path(r'^$', views.index, name='books_index'),
+    re_path(r'^category/(?P<category_slug>[-\w.]+)/$', views.index, name='books_index_category'),
+    re_path(r'^(?P<book_id>\d+)/$', views.view_book, name='books_book'),
+    re_path(r'^(?P<book_id>\d+)/format/(?P<format_id>\d+)/$', views.download_format, name='books_download_format'),
+    re_path(r'^(?P<book_id>\d+)/format/(?P<format_id>\d+)/mark_download/(?P<mark_download>no|yes)/$', views.download_format, name='books_download_format'),
+    re_path(r'^(?P<book_id>\d+)/format/(?P<format_id>\d+)/read/$', views.read_epub, name='books_read_epub'),
+    re_path(r'^(?P<book_id>\d+)/chapter/(?P<chapter_id>\d+)$',
         views.view_chapter,
         name='book_view_chapter'),
-    url(r'^(?P<book_id>\d+)/format/(?P<chapter_id>\d+)/download/$',
+    re_path(r'^(?P<book_id>\d+)/format/(?P<chapter_id>\d+)/download/$',
         views.download_chapter,
         name='books_download_chapter'),
 
-    url(r'^admin/$', views.admin, name='books_admin'),
-    url(r'^admin/categories/$', views.categories, name='books_categories'),
-    url(r'^admin/categories/(?P<category_id>\d+)$', views.categories, name='books_edit_category'),
-    url(r'^admin/new/$', views.edit_book, name='books_new_book'),
-    url(r'^admin/edit/(?P<book_id>\d+)/$', views.edit_book, name='books_edit_book'),
-    url(r'^admin/edit/(?P<book_id>\d+)/contributor/$', views.edit_contributor, name='books_new_contributor'),
-    url(r'^admin/edit/(?P<book_id>\d+)/contributor/(?P<contributor_id>\d+)$', views.edit_contributor,
+    re_path(r'^admin/$', views.admin, name='books_admin'),
+    re_path(r'^admin/categories/$', views.categories, name='books_categories'),
+    re_path(r'^admin/categories/(?P<category_id>\d+)$', views.categories, name='books_edit_category'),
+    re_path(r'^admin/new/$', views.edit_book, name='books_new_book'),
+    re_path(r'^admin/edit/(?P<book_id>\d+)/$', views.edit_book, name='books_edit_book'),
+    re_path(r'^admin/edit/(?P<book_id>\d+)/contributor/$', views.edit_contributor, name='books_new_contributor'),
+    re_path(r'^admin/edit/(?P<book_id>\d+)/contributor/(?P<contributor_id>\d+)$', views.edit_contributor,
         name='books_edit_contributor'),
-    url(r'^admin/edit/(?P<book_id>\d+)/format/$', views.edit_format, name='books_new_format'),
-    url(r'^admin/edit/(?P<book_id>\d+)/format/(?P<format_id>\d+)/$', views.edit_format, name='books_edit_format'),
+    re_path(r'^admin/edit/(?P<book_id>\d+)/format/$', views.edit_format, name='books_new_format'),
+    re_path(r'^admin/edit/(?P<book_id>\d+)/format/(?P<format_id>\d+)/$', views.edit_format, name='books_edit_format'),
 
-    url(r'^admin/edit/(?P<book_id>\d+)/chapter/new/$',
+    re_path(r'^admin/edit/(?P<book_id>\d+)/chapter/new/$',
         views.books_chapter,
         name='books_new_chapter'),
-    url(r'^admin/edit/(?P<book_id>\d+)/chapter/edit/(?P<chapter_id>\d+)/$',
+    re_path(r'^admin/edit/(?P<book_id>\d+)/chapter/edit/(?P<chapter_id>\d+)/$',
         views.books_chapter,
         name='books_edit_chapter'),
 
-    url(r'^admin/import/$', views.import_books_upload, name='books_import_books_upload'),
-    url(r'^admin/import/(?P<uuid>.+)/process/$', views.import_books_process, name='books_import_process'),
-    url(r'^admin/import/(?P<uuid>.+)/$', views.import_books_preview, name='books_import_preview'),
+    re_path(r'^admin/import/$', views.import_books_upload, name='books_import_books_upload'),
+    re_path(r'^admin/import/(?P<uuid>.+)/process/$', views.import_books_process, name='books_import_process'),
+    re_path(r'^admin/import/(?P<uuid>.+)/$', views.import_books_preview, name='books_import_preview'),
 
-    url(r'^admin/metrics/$', views.book_metrics, name='books_metrics'),
-    url(r'^admin/metrics/by_month/$', views.book_metrics_by_month, name='books_metrics_by_month'),
+    re_path(r'^admin/metrics/$', views.book_metrics, name='books_metrics'),
+    re_path(r'^admin/metrics/by_month/$', views.book_metrics_by_month, name='books_metrics_by_month'),
 
-    url(r'^onix/export/$', views.export_onix_xml, name='books_export_onix_xml'),
-    url(r'^onix/export/(?P<book_id>\d+)/$', views.export_onix_xml, name='books_export_onix_xml_book'),
+    re_path(r'^onix/export/$', views.export_onix_xml, name='books_export_onix_xml'),
+    re_path(r'^onix/export/(?P<book_id>\d+)/$', views.export_onix_xml, name='books_export_onix_xml_book'),
 ]

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`class BooksConfig(AppConfig):`
`5`		`- name = 'books'`
	`5`	`+ name = 'plugins.books'`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% load static from staticfiles %}`
	`1`	`+{% load static %}`
`2`	`2`	`{% load i18n %}`
`3`	`3`	`<div class="large-12 columns">`
`4`	`4`	`<div class="content clearfix">`