Merge branch 'release/0.9.2'

HISTORY

@@ -2,6 +2,19 @@ Changelog for django-filer
 ==========================
 
 
+0.9.2 (2012-11-19)
+------------------
+
+* File.name move to not null (run migrations)
+* Fix popup mode when Folder doesn't exists
+* #271 Remove unused templatetag from django 1.4
+* #269 Hide "Folder permissions" entry for "normal" users
+* #265 click on image thumbnail in popup looses context
+* #264 cancel search button looses popup context
+* #263 deleting images from the image detail view redirects to the wrong list view
+
+
+
 0.9.1 (2012-10-12)
 ------------------
 

docs/installation.rst

@@ -38,8 +38,17 @@ packaged fork of `PIL`_).
 Configuration
 -------------
 
-Add ``"filer"`` to your project's ``INSTALLED_APPS`` setting and run ``manage.py syncdb``
-(or ``manage.py migrate`` if you're using `South`_).
+Add ``"filer"`` and related apps to your project's ``INSTALLED_APPS`` setting and run ``manage.py syncdb``
+(or ``manage.py migrate`` if you're using `South`_).::
+
+    INSTALLED_APPS = [
+        ...
+        'filer',
+        'easy_thumbnails',
+        ...
+    ]
+
+
 
 Note that `easy_thumbnails`_ also has database tables and needs a ``syncdb`` or 
 ``migrate``.

docs/upgrading.rst

@@ -3,6 +3,13 @@
 Upgrading
 =========
 
+from 0.9.1 to 0.9.2
+-------------------
+
+From 0.9.2 ``File.name`` field is ``null=False``.
+
+.. warning::
+    Data migration in 0.9.2 changes existing null values to empty string.
 
 from 0.8.7 to 0.9
 -----------------

filer/__init__.py

@@ -1,3 +1,3 @@
 #-*- coding: utf-8 -*-
 # version string following pep-0396 and pep-0386
-__version__ = '0.9.1'  # pragma: nocover
+__version__ = '0.9.2'  # pragma: nocover

filer/admin/fileadmin.py

@@ -111,7 +111,8 @@ def delete_view(self, request, object_id, extra_context=None):
         # Check against filer_file_changelist as file deletion is always made by
         # the base class
         if (url in ["../../../../", "../../"] or
-            url == reverse("admin:filer_file_changelist")):
+            url == reverse("admin:filer_file_changelist") or
+            url == reverse("admin:filer_image_changelist")):
             if parent_folder:
                 url = reverse('admin:filer-directory_listing',
                                   kwargs={'folder_id': parent_folder.id})

filer/admin/folderadmin.py

@@ -208,6 +208,7 @@ def directory_listing(self, request, folder_id=None, viewtype=None):
                 Folder.objects.get(id=last_folder_id)
             except Folder.DoesNotExist:
                 url = reverse('admin:filer-directory_listing-root')
+                url = "%s%s%s" % (url, popup_param(request), selectfolder_param(request,"&"))
             else:
                 url = reverse('admin:filer-directory_listing', kwargs={'folder_id': last_folder_id})
                 url = "%s%s%s" % (url, popup_param(request), selectfolder_param(request,"&"))

filer/admin/permissionadmin.py

@@ -29,7 +29,7 @@ def formfield_for_foreignkey(self, db_field, request, **kwargs):
     def get_model_perms(self, request):
         # don't display the permissions admin if permissions are disabled.
         # This method is easier for testing than not registering the admin at all at import time
-        enable_permissions = settings.FILER_ENABLE_PERMISSIONS
+        enable_permissions = settings.FILER_ENABLE_PERMISSIONS and request.user.has_perm('filer.add_folderpermission')
         return {
             'add': enable_permissions,
             'change': enable_permissions,