X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/4224405082d62f618814244e289b077c7e1b0366..59b65a24cec4ac67848293297f3bb1bd6cf99872:/apps/catalogue/models.py?ds=inline diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 8a7722749..61e78a00f 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -97,6 +97,7 @@ class Book(models.Model): objects = models.Manager() tagged = managers.ModelTaggedItemManager(Tag) tags = managers.TagDescriptor(Tag) + @property def name(self): @@ -157,8 +158,14 @@ class Book(models.Model): book_info = dcparser.parse(xml_file) book_base, book_slug = book_info.url.rsplit('/', 1) book, created = Book.objects.get_or_create(slug=book_slug) - if not created and not overwrite: - raise Book.AlreadyExists('Book %s already exists' % book_slug) + + if created: + book_shelves = [] + else: + if not overwrite: + raise Book.AlreadyExists('Book %s already exists' % book_slug) + # Save shelves for this book + book_shelves = list(book.tags.filter(category='set')) book.title = book_info.title book._short_html = '' @@ -224,7 +231,7 @@ class Book(models.Model): book_themes += themes book_themes = set(book_themes) - book.tags = list(book.tags) + list(book_themes) + book.tags = list(book.tags) + list(book_themes) + book_shelves book.save() return book