Merge pull request #11435 from edx/bugfix/add-admin-for-ext-exclusion

Fix up the excluded extensions bit.
This commit is contained in:
Toby Lawrence
2016-02-05 12:15:07 -05:00
2 changed files with 22 additions and 2 deletions

View File

@@ -5,7 +5,7 @@ that gets prepended to asset URLs in order to serve them from, say, a CDN.
from django.contrib import admin
from config_models.admin import ConfigurationModelAdmin
from .models import AssetBaseUrlConfig
from .models import AssetBaseUrlConfig, AssetExcludedExtensionsConfig
class AssetBaseUrlConfigAdmin(ConfigurationModelAdmin):
@@ -27,4 +27,24 @@ class AssetBaseUrlConfigAdmin(ConfigurationModelAdmin):
return self.list_display
class AssetExcludedExtensionsConfigAdmin(ConfigurationModelAdmin):
"""
Basic configuration for asset base URL.
"""
list_display = [
'excluded_extensions'
]
def get_list_display(self, request):
"""
Restore default list_display behavior.
ConfigurationModelAdmin overrides this, but in a way that doesn't
respect the ordering. This lets us customize it the usual Django admin
way.
"""
return self.list_display
admin.site.register(AssetBaseUrlConfig, AssetBaseUrlConfigAdmin)
admin.site.register(AssetExcludedExtensionsConfig, AssetExcludedExtensionsConfigAdmin)

View File

@@ -48,7 +48,7 @@ class AssetExcludedExtensionsConfig(ConfigurationModel):
return map(add_period, cls.current().excluded_extensions.split())
def __repr__(self):
return '<AssetExcludedExtensionsConfig(extensions={})>'.format(self.get_excluded_extensions().split())
return '<AssetExcludedExtensionsConfig(extensions={})>'.format(self.get_excluded_extensions())
def __unicode__(self):
return unicode(repr(self))