Merge branch 'LeaFin-patch-1'

This commit is contained in:
David Burke 2014-08-17 15:12:48 -04:00
commit 555d863b50
2 changed files with 8 additions and 2 deletions

View file

@ -21,7 +21,10 @@ except ImportError: # Django < 1.4
from django.conf.urls.defaults import patterns, url
from constance import config, settings
from constance import settings
from constance.config import Config as ConfigClass
config = ConfigClass()
NUMERIC_WIDGET = forms.TextInput(attrs={'size': 10})

View file

@ -99,6 +99,7 @@ INSTALLED_APPS = (
'cheeseshop.apps.catalog',
'cheeseshop.apps.storage',
'constance',
'constance.backends.database',
)
CONSTANCE_CONNECTION = {
@ -108,8 +109,10 @@ CONSTANCE_CONNECTION = {
}
CONSTANCE_CONFIG = {
'BANNER': ('The National Cheese Emporium', 'name of the shop'),
'BANNER': ('The National Cheese Emporium', 'name of the shop'),
'OWNER': ('Mr. Henry Wensleydale', 'owner of the shop'),
'MUSICIANS': (4, 'number of musicians inside the shop'),
'DATE_ESTABLISHED': (datetime(1972, 11, 30), "the shop's first opening"),
}
CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend'