Fix error with revision check during saving.

[redakcja.git] / src / documents / models / book.py

diff --git a/src/documents/models/book.py b/src/documents/models/book.py
index fa93eeb..9c12085 100644 (file)
--- a/src/documents/models/book.py
+++ b/src/documents/models/book.py
@@ -379,7 +379,7 @@ class Book(models.Model):
                 except:
                     pass
                 else:
                 except:
                     pass
                 else:

-                    if info.cover_source == image.get_full_url():
+                    if info.cover_source.rstrip('/') == image.get_full_url().rstrip('/'):

                         update['dc_cover_image'] = image
             update['dc'] = info.to_dict()
         Book.objects.filter(pk=self.pk).update(**update)
                         update['dc_cover_image'] = image
             update['dc'] = info.to_dict()
         Book.objects.filter(pk=self.pk).update(**update)


@@ -401,9 +401,9 @@ class Book(models.Model):
             xml = self.materialize(publishable=True).encode('utf-8')
             info = BookInfo.from_bytes(xml)
             kwargs = {}
             xml = self.materialize(publishable=True).encode('utf-8')
             info = BookInfo.from_bytes(xml)
             kwargs = {}

-            if chunk.book.project is not None:
-                if chunk.book.project.logo_mono or chunk.book.project.logo:
-                    kwargs['cover_logo'] = (chunk.book.project.logo_mono or chunk.book.project.logo).path
+            if self.project is not None:
+                if self.project.logo_mono or self.project.logo:
+                    kwargs['cover_logo'] = (self.project.logo_mono or self.project.logo).path

             cover = make_cover(info, width=width, height=height, **kwargs)
             out = BytesIO()
             ext = cover.ext()
             cover = make_cover(info, width=width, height=height, **kwargs)
             out = BytesIO()
             ext = cover.ext()


@@ -478,8 +478,10 @@ class Book(models.Model):
                 if self.project.logo_mono:
                     data['logo_mono'] = urljoin(
                         'https://' + Site.objects.get_current().domain,
                 if self.project.logo_mono:
                     data['logo_mono'] = urljoin(
                         'https://' + Site.objects.get_current().domain,

-                        self.project.logo.url,
+                        self.project.logo_mono.url,

                     )
                     )

+                if self.project.logo_alt:
+                    data['logo_alt'] = self.project.logo_alt

             if host:
                 data['gallery_url'] = host + self.gallery_url()
             apiclient.api_call(user, "books/", data, beta=beta)
             if host:
                 data['gallery_url'] = host + self.gallery_url()
             apiclient.api_call(user, "books/", data, beta=beta)