Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11319 from open-craft/remove-comprehensive-theme-finders

Browse Source 
Remove ThemingAware storage mixins and ComprehensiveThemeFinder
This commit is contained in:
Matjaz Gregoric
2016-02-02 17:57:36 +01:00
parent 78370f3644 266f593d2d
commit bb0c2901c7
5 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cms/envs/common.py
View File

@@ -487,7 +487,6 @@ STATICFILES_STORAGE = 'openedx.core.storage.ProductionStorage'
# List of finder classes that know how to find static files in various locations. # List of finder classes that know how to find static files in various locations.
# Note: the pipeline finder is included to be able to discover optimized files # Note: the pipeline finder is included to be able to discover optimized files
STATICFILES_FINDERS = [ STATICFILES_FINDERS = [
'openedx.core.djangoapps.theming.finders.ComprehensiveThemeFinder',
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'pipeline.finders.PipelineFinder', 'pipeline.finders.PipelineFinder',

1
cms/envs/devstack.py
View File

@@ -41,7 +41,6 @@ STATICFILES_STORAGE = 'openedx.core.storage.DevelopmentStorage'
# Revert to the default set of finders as we don't want the production pipeline # Revert to the default set of finders as we don't want the production pipeline
STATICFILES_FINDERS = [ STATICFILES_FINDERS = [
'openedx.core.djangoapps.theming.finders.ComprehensiveThemeFinder',
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
] ]

1
lms/envs/common.py
View File

@@ -1163,7 +1163,6 @@ STATICFILES_STORAGE = 'openedx.core.storage.ProductionStorage'
# List of finder classes that know how to find static files in various locations. # List of finder classes that know how to find static files in various locations.
# Note: the pipeline finder is included to be able to discover optimized files # Note: the pipeline finder is included to be able to discover optimized files
STATICFILES_FINDERS = [ STATICFILES_FINDERS = [
'openedx.core.djangoapps.theming.finders.ComprehensiveThemeFinder',
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
'pipeline.finders.PipelineFinder', 'pipeline.finders.PipelineFinder',

1
lms/envs/devstack.py
View File

@@ -99,7 +99,6 @@ STATICFILES_STORAGE = 'openedx.core.storage.DevelopmentStorage'
# Revert to the default set of finders as we don't want the production pipeline # Revert to the default set of finders as we don't want the production pipeline
STATICFILES_FINDERS = [ STATICFILES_FINDERS = [
'openedx.core.djangoapps.theming.finders.ComprehensiveThemeFinder',
'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.FileSystemFinder',
'django.contrib.staticfiles.finders.AppDirectoriesFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder',
] ]

3
openedx/core/storage.py
View File

@@ -4,11 +4,9 @@ Django storage backends for Open edX.
from django.contrib.staticfiles.storage import StaticFilesStorage, CachedFilesMixin from django.contrib.staticfiles.storage import StaticFilesStorage, CachedFilesMixin
from pipeline.storage import PipelineMixin, NonPackagingMixin from pipeline.storage import PipelineMixin, NonPackagingMixin
from require.storage import OptimizedFilesMixin from require.storage import OptimizedFilesMixin
from openedx.core.djangoapps.theming.storage import ComprehensiveThemingAwareMixin
class ProductionStorage( class ProductionStorage(
ComprehensiveThemingAwareMixin,
OptimizedFilesMixin, OptimizedFilesMixin,
PipelineMixin, PipelineMixin,
CachedFilesMixin, CachedFilesMixin,
@@ -22,7 +20,6 @@ class ProductionStorage(
class DevelopmentStorage( class DevelopmentStorage(
ComprehensiveThemingAwareMixin,
NonPackagingMixin, NonPackagingMixin,
PipelineMixin, PipelineMixin,
StaticFilesStorage StaticFilesStorage