Commits

Anonymous committed ed5ad55

fix elfinder settings

Comments (0)

Files changed (1)

     
     user_options = getattr(settings, 'ELFINDER_OPTIONS', None)
     
-    if options != None:
-        if isinstance(options, dict):
+    if user_options != None:
+        if isinstance(user_options, dict):
             # Override defaults with CKEDITOR_OPTIONS.
-            user_options.update(options)
+            options.update(user_options)
         else:
             raise ImproperlyConfigured('CKEDITOR_OPTIONS setting must be a '
                                        'dictionary type.')
 
     return render(request, 'cked/elfinder.html', {
-        'options': json_encode(user_options),
+        'options': json_encode(options),
     })
 
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.