X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/54d2f3a9f5501bfca8ab48544123f2851c6c4085..b7d092eeaf7403386bfba7ed85b8abeb2109ada8:/apps/catalogue/forms.py?ds=sidebyside

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 26d14aa4..40c9608e 100644
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -20,7 +20,7 @@ class DocumentCreateForm(forms.ModelForm):
 
     class Meta:
         model = Book
-        exclude = ['parent', 'parent_number']
+        exclude = ['parent', 'parent_number', 'project']
 
     def __init__(self, *args, **kwargs):
         super(DocumentCreateForm, self).__init__(*args, **kwargs)
@@ -72,7 +72,7 @@ class ChunkForm(forms.ModelForm):
     """
     user = forms.ModelChoiceField(queryset=
         User.objects.annotate(count=Count('chunk')).
-        order_by('-count', 'last_name', 'first_name'), required=False,
+        order_by('last_name', 'first_name'), required=False,
         label=_('Assigned to')) 
 
     class Meta:
@@ -130,6 +130,7 @@ class BookForm(forms.ModelForm):
 
     class Meta:
         model = Book
+        exclude = ['project']
 
     def __init__(self, *args, **kwargs):
         ret = super(BookForm, self).__init__(*args, **kwargs)
@@ -137,6 +138,18 @@ class BookForm(forms.ModelForm):
         self.fields['title'].widget.attrs.update({"class": "autoslug-source"})
         return ret
 
+    def save(self, **kwargs):
+        orig_instance = Book.objects.get(pk=self.instance.pk)
+        old_gallery = orig_instance.gallery
+        new_gallery = self.cleaned_data['gallery']
+        if new_gallery != old_gallery:
+            import shutil
+            import os.path
+            from django.conf import settings
+            shutil.move(orig_instance.gallery_path(),
+                        os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, new_gallery))
+        super(BookForm, self).save(**kwargs)
+
 
 class ReadonlyBookForm(BookForm):
     """Form used for not editing a Book."""
@@ -174,7 +187,7 @@ class ImageForm(forms.ModelForm):
 
 
 class ReadonlyImageForm(ImageForm):
-    """Form used for not editing a Book."""
+    """Form used for not editing an Image."""
 
     def __init__(self, *args, **kwargs):
         ret = super(ReadonlyImageForm, self).__init__(*args, **kwargs)