X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/b2d342589a7889a3b096e7192453d53bd28eed7d..d4489421ccb20d02ad94d4782478a9a38d438ec5:/src/dictionary/models.py?ds=sidebyside diff --git a/src/dictionary/models.py b/src/dictionary/models.py index 7df6ddc87..5c3d2b998 100644 --- a/src/dictionary/models.py +++ b/src/dictionary/models.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # @@ -19,7 +18,7 @@ class Qualifier(models.Model): class Meta: ordering = ['qualifier'] - def __unicode__(self): + def __str__(self): return self.name or self.qualifier @@ -37,8 +36,8 @@ class Note(models.Model): class NoteSource(models.Model): """Represents a single annotation from a book.""" - note = models.ForeignKey(Note) - book = models.ForeignKey(Book) + note = models.ForeignKey(Note, models.CASCADE) + book = models.ForeignKey(Book, models.CASCADE) anchor = models.CharField(max_length=64) class Meta: @@ -69,7 +68,6 @@ def build_notes(book): fn_type=fn_type, language=language ) - qualifier_objects = [] for qualifier in qualifiers: obj, created = Qualifier.objects.get_or_create( @@ -77,7 +75,7 @@ def build_notes(book): 'name': FN_QUALIFIERS.get(qualifier, '') }) qualifier_objects.append(obj) - note.qualifiers = qualifier_objects + note.qualifiers.set(qualifier_objects) note.notesource_set.create(book=book, anchor=anchor) Note.objects.filter(notesource=None).delete()