Merge pull request django-ckeditor#178 from sbussetti/master

Allow uploads to be prefixed by any adhoc property on the user, not just the username

Author: matthiask

README.rst

@@ -161,7 +161,7 @@ Optional for file upload
 ~~~~~~~~~~~~~~~~~~~~~~~~
 #. All uploaded files are slugified by default. To disable this feature, set ``CKEDITOR_UPLOAD_SLUGIFY_FILENAME`` to ``False``.
 
-#. Set the ``CKEDITOR_RESTRICT_BY_USER`` setting to ``True`` in the project's ``settings.py`` file (default ``False``). This restricts access to uploaded images to the uploading user (e.g. each user only sees and uploads their own images). Superusers can still see all images. **NOTE**: This restriction is only enforced within the CKEditor media browser.
+#. Set the ``CKEDITOR_RESTRICT_BY_USER`` setting to ``True`` in the project's ``settings.py`` file (default ``False``). This restricts access to uploaded images to the uploading user (e.g. each user only sees and uploads their own images).  Upload paths are prefixed by the string returned by ``get_username``.  If ``CKEDITOR_RESTRICT_BY_USER`` is set to a string, the named property is used instead.  Superusers can still see all images. **NOTE**: This restriction is only enforced within the CKEditor media browser.
 
 #. Set the ``CKEDITOR_BROWSE_SHOW_DIRS`` setting to ``True`` to show directories on the "Browse Server" page. This enables image grouping by directory they are stored in, sorted by date.
 

ckeditor_uploader/views.py

@@ -22,8 +22,17 @@ def get_upload_filename(upload_name, user):
     user_path = ''
 
     # If CKEDITOR_RESTRICT_BY_USER is True upload file to user specific path.
-    if getattr(settings, 'CKEDITOR_RESTRICT_BY_USER', False):
-        user_path = user.get_username()
+    RESTRICT_BY_USER = getattr(settings, 'CKEDITOR_RESTRICT_BY_USER', False)
+    if RESTRICT_BY_USER:
+        try:
+            user_prop = getattr(user, RESTRICT_BY_USER)
+        except AttributeError:
+            user_prop = getattr(user, 'get_username')
+
+        if callable(user_prop):
+            user_path = user_prop()
+        else:
+            user_path = user_prop
 
     # Generate date based path to put uploaded file.
     # If CKEDITOR_RESTRICT_BY_DATE is True upload file to date specific path.