Merge 44a2a2c into 51196fd

django-cms · Feb 4, 2015 · 23442ea · 23442ea
2 parents 51196fd + 44a2a2c
commit 23442ea
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/filer/fields/file.py b/filer/fields/file.py
@@ -115,12 +115,17 @@ def __init__(self, **kwargs):
         # We hard-code the `to` argument for ForeignKey.__init__
         if "to" in kwargs.keys():
             old_to = kwargs.pop("to")
-            msg = "%s can only be a ForeignKey to %s; %s passed" % (
-                self.__class__.__name__, self.default_model_class.__name__, old_to
+            dfl = "%s.%s" % (
+                    self.default_model_class._meta.app_label,
+                    self.default_model_class.__name__
             )
-            warnings.warn(msg, SyntaxWarning)
+            if old_to != dfl:
+                msg = "%s can only be a ForeignKey to %s; %s passed" % (
+                    self.__class__.__name__, self.default_model_class.__name__, old_to
+                )
+                warnings.warn(msg, SyntaxWarning)
         kwargs['to'] = self.default_model_class
-        return super(FilerFileField, self).__init__(**kwargs)
+        super(FilerFileField, self).__init__(**kwargs)
 
     def formfield(self, **kwargs):
         # This is a fairly standard way to set up some defaults

diff --git a/filer/fields/folder.py b/filer/fields/folder.py
@@ -18,6 +18,7 @@
 class AdminFolderWidget(ForeignKeyRawIdWidget):
     choices = None
     input_type = 'hidden'
+    is_hidden = False
 
     def render(self, name, value, attrs=None):
         obj = self.obj_for_value(value)
@@ -109,12 +110,17 @@ def __init__(self, **kwargs):
         # We hard-code the `to` argument for ForeignKey.__init__
         if "to" in kwargs.keys():
             old_to = kwargs.pop("to")
-            msg = "%s can only be a ForeignKey to %s; %s passed" % (
-                self.__class__.__name__, self.default_model_class.__name__, old_to
+            dfl = "%s.%s" % (
+                    self.default_model_class._meta.app_label,
+                    self.default_model_class.__name__
             )
-            warnings.warn(msg, SyntaxWarning)
+            if old_to != dfl:
+                msg = "%s can only be a ForeignKey to %s; %s passed" % (
+                    self.__class__.__name__, self.default_model_class.__name__, old_to
+                )
+                warnings.warn(msg, SyntaxWarning)
         kwargs['to'] = self.default_model_class
-        return super(FilerFolderField, self).__init__(**kwargs)
+        super(FilerFolderField, self).__init__(**kwargs)
 
     def formfield(self, **kwargs):
         # This is a fairly standard way to set up some defaults

diff --git a/filer/fields/multistorage_file.py b/filer/fields/multistorage_file.py
@@ -102,8 +102,9 @@ def __init__(self, verbose_name=None, name=None,
                  storages=None, thumbnail_storages=None, thumbnail_options=None, **kwargs):
         if 'upload_to' in kwargs:
             upload_to = kwargs.pop("upload_to")
-            warnings.warn("MultiStorageFileField can handle only File objects;"
-                          "%s passed" % upload_to, SyntaxWarning)
+            if upload_to != generate_filename_multistorage:
+                warnings.warn("MultiStorageFileField can handle only File objects;"
+                              "%s passed" % upload_to, SyntaxWarning)
         self.storages = storages or STORAGES
         self.thumbnail_storages = thumbnail_storages or THUMBNAIL_STORAGES
         self.thumbnail_options = thumbnail_options or THUMBNAIL_OPTIONS