From: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Date: Fri, 13 Aug 2010 08:57:57 +0000 (+0200)
Subject: Merge remote branch 'klitynski/master'
X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/089e42600c995f8b8b23c69ba93419167c0ae5be?hp=a8828a545c78f34a9b5bfaff8905eccc8985ff23

Merge remote branch 'klitynski/master'
---

diff --git a/apps/catalogue/fields.py b/apps/catalogue/fields.py
index 62ca29cb9..11c730c71 100644
--- a/apps/catalogue/fields.py
+++ b/apps/catalogue/fields.py
@@ -9,7 +9,7 @@ from django.db import models
 from django.db.models import signals
 from django import forms
 from django.forms.widgets import flatatt
-from django.forms.util import smart_unicode
+from django.utils.encoding import smart_unicode
 from django.utils import simplejson as json
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 935983734..3aceb4f86 100644
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -14,8 +14,8 @@ from catalogue import utils
 class BookImportForm(forms.Form):
     book_xml_file = forms.FileField()
 
-    def save(self, commit=True):
-        return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True)
+    def save(self, commit=True, **kwargs):
+        return Book.from_xml_file(self.cleaned_data['book_xml_file'], overwrite=True, **kwargs)
 
 
 class SearchForm(forms.Form):
diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index dd251c16a..4ef0a14e6 100644
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -207,7 +207,7 @@ class Book(models.Model):
     def __unicode__(self):
         return self.title
 
-    def save(self, force_insert=False, force_update=False, reset_short_html=True, refresh_mp3=True):
+    def save(self, force_insert=False, force_update=False, reset_short_html=True, refresh_mp3=True, **kwargs):
         if reset_short_html:
             # Reset _short_html during save
             update = {}