Fix .settings module name class with django's top settings
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
from __future__ import absolute_import
|
||||
|
||||
import os
|
||||
|
||||
from django.core.files.storage import FileSystemStorage
|
||||
|
||||
from storage import FILESTORAGE_LOCATION
|
||||
from storage.settings import FILESTORAGE_LOCATION
|
||||
|
||||
|
||||
class FileBasedStorage(FileSystemStorage):
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
from __future__ import absolute_import
|
||||
|
||||
import os
|
||||
|
||||
from django.core.files.storage import Storage
|
||||
@@ -6,7 +8,7 @@ from django.utils.encoding import force_unicode
|
||||
from pymongo import Connection
|
||||
from gridfs import GridFS
|
||||
|
||||
from storage.conf import settings
|
||||
from storage import settings
|
||||
|
||||
|
||||
class GridFSStorage(Storage):
|
||||
|
||||
@@ -3,13 +3,12 @@ from __future__ import absolute_import
|
||||
import os
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.conf import settings
|
||||
from django.conf import settings as django_settings
|
||||
|
||||
from smart_settings import LocalScope
|
||||
|
||||
from .icons import icon_storage
|
||||
|
||||
name = 'storage'
|
||||
label = _(u'Storage')
|
||||
description = _(u'Handles actual storage of files by means of specialized backends.')
|
||||
icon = icon_storage
|
||||
@@ -32,7 +31,7 @@ settings = [
|
||||
},
|
||||
{
|
||||
'name': 'FILESTORAGE_LOCATION',
|
||||
'default': os.path.join(settings.PROJECT_ROOT, u'document_storage'),
|
||||
'default': os.path.join(django_settings.PROJECT_ROOT, u'document_storage'),
|
||||
'exists': True,
|
||||
'scopes': [LocalScope()]
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user