From: Marcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Date: Wed, 28 Nov 2012 14:50:00 +0000 (+0100)
Subject: Merge branch 'master' into edumed
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/df9d185f88fa914f619261ea5564003bb93a6041?hp=2e8e16efd4920499d1c890d16ed5a722e986c506

Merge branch 'master' into edumed
---

diff --git a/apps/catalogue/helpers.py b/apps/catalogue/helpers.py
index 0009c6db..d340b461 100644
--- a/apps/catalogue/helpers.py
+++ b/apps/catalogue/helpers.py
@@ -46,8 +46,6 @@ def parse_isodate(isodate):
 
 class GalleryMerger(object):
     def __init__(self, dest_gallery, src_gallery):
-        assert isinstance(dest_gallery, str)
-        assert isinstance(src_gallery, str)
         self.dest = dest_gallery
         self.src = src_gallery
         self.dest_size = None
diff --git a/apps/catalogue/models/book.py b/apps/catalogue/models/book.py
index 772634c6..4d1b12e4 100755
--- a/apps/catalogue/models/book.py
+++ b/apps/catalogue/models/book.py
@@ -205,7 +205,8 @@ class Book(models.Model):
         # and move the gallery starts
         if gm.was_merged:
                 for chunk in self[len(self) - len_other:]:
-                        chunk.gallery_start += gm.dest_size - gm.num_deleted
+                        old_start = chunk.gallery_start or 1
+                        chunk.gallery_start = old_start + gm.dest_size - gm.num_deleted
                         chunk.save()
 
         other.delete()
diff --git a/apps/catalogue/tests/gallery.py b/apps/catalogue/tests/gallery.py
index e1f636dc..ad0dfd7d 100644
--- a/apps/catalogue/tests/gallery.py
+++ b/apps/catalogue/tests/gallery.py
@@ -20,8 +20,6 @@ class GalleryAppendTests(TestCase):
         self.book1 = Book.create(self.user, 'book 1', slug='book1')
         self.book1.chunk_set.create(number=2, title='Second chunk',
                 slug='book 1 / 2')
-        c=self.book1[0]
-        c.gallery_start=1
         c=self.book1[1]
         c.gallery_start=3
         
@@ -43,9 +41,6 @@ class GalleryAppendTests(TestCase):
         self.book2.chunk_set.create(number=2, title='Second chunk of second book',
                 slug='book 2 / 2')
 
-        c = self.book2[0]
-        c.gallery_start = 1
-        c.save()
         c = self.book2[1]
         c.gallery_start = 3
         c.save()
diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 0356d509..4b825e5e 100644
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -202,12 +202,12 @@ def gallery(request, directory):
     try:
         base_url = ''.join((
                         smart_unicode(settings.MEDIA_URL),
-                        smart_unicode(settings.FILEBROWSER_DIRECTORY),
+                        smart_unicode(settings.IMAGE_DIR),
                         smart_unicode(directory)))
 
         base_dir = os.path.join(
                     smart_unicode(settings.MEDIA_ROOT),
-                    smart_unicode(settings.FILEBROWSER_DIRECTORY),
+                    smart_unicode(settings.IMAGE_DIR),
                     smart_unicode(directory))
 
         def map_to_url(filename):
diff --git a/redakcja/settings/common.py b/redakcja/settings/common.py
index f6b889da..ec4ff7af 100644
--- a/redakcja/settings/common.py
+++ b/redakcja/settings/common.py
@@ -139,6 +139,8 @@ FILEBROWSER_VERSIONS_BASEDIR = 'thumbnails/'
 FILEBROWSER_DEFAULT_ORDER = "path_relative"
 
 # REPOSITORY_PATH = '/Users/zuber/Projekty/platforma/files/books'
+
+# Must match FILEBROWSER_DIRECTORY
 IMAGE_DIR = 'images'