Merge branch 'master' of edugit.org:Teckids/BiscuIT/BiscuIT-App-Exlibris

biscuit/apps/exlibris/models.py

@@ -3,10 +3,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from isbn_field import ISBNField
 
-from biscuit.core.mixins import SchoolRelated
 
-
-class Book(SchoolRelated):
+class Book(models.Model):
     """A book that is available for borrowing by persons."""
 
     title = models.CharField(verbose_name=_('Book title'), max_length=50)
@@ -36,7 +34,7 @@ class Book(SchoolRelated):
         return True
 
     class Meta:
-        unique_together = [['school', 'title', 'author', 'edition', 'year']]
+        unique_together = [['title', 'author', 'edition', 'year']]
         ordering = ['title', 'year', 'edition']
 
 

biscuit/apps/exlibris/views.py

@@ -14,6 +14,7 @@ import labels
 import PIL
 from reportlab.graphics import barcode, shapes
 
+from biscuit.core.models import School
 from biscuit.core.util import messages
 
 from .forms import BookAddISBNForm, BookEditForm, BookCopiesBulkAddForm, BookCopyEditForm, BookGetCopyForm, PersonBorrowForm
@@ -212,7 +213,7 @@ def book_copies_labels(request: HttpRequest, id_: int) -> HttpResponse:
                                    os.path.join(temp_dir, barcode_file)))
 
             school = shapes.String(
-                0, 8, obj.book.school.name, fontSize=10)
+                0, 8, School.objects.first().name, fontSize=10)
             label.add(school)
 
             bottom_line = shapes.String(