update project settings. Add jet settings

remotes/origin/HEAD
Max Yakovenko 8 years ago
parent d74341a5d8
commit c810eb3c73
  1. 9
      eshop_project/settings/base.py
  2. 26
      eshop_project/settings/development.py
  3. 2
      eshop_project/settings/production.py

@ -55,6 +55,8 @@ INSTALLED_APPS = [
'captcha',
'mptt',
'import_export',
'django_feedparser',
'jet.dashboard',
'jet',
'djcelery_email',
@ -144,7 +146,7 @@ DATABASES = {
}
# DJANGO REGISTRATION PACKAGE SETTINGS
ACCOUNT_ACTIVATION_DAYS = env.int('ACCOUNT_ACTIVATION_DAYS',default=1)
ACCOUNT_ACTIVATION_DAYS = env.int('ACCOUNT_ACTIVATION_DAYS',default=3)
REGISTRATION_AUTO_LOGIN = env.int('REGISTRATION_AUTO_LOGIN',default=False)
REGISTRATION_OPEN = env.bool('REGISTRATION_OPEN', default=True)
REGISTRATION_EMAIL_HTML = env.bool("REGISTRATION_EMAIL_HTML", True)
@ -244,6 +246,11 @@ LOGGING = {
}
}
# Jet configuration
JET_SIDE_MENU_COMPACT = True
JET_CHANGE_FORM_SIBLING_LINKS = True
JET_INDEX_DASHBOARD = 'jet.dashboard.dashboard.DefaultIndexDashboard'
JET_APP_INDEX_DASHBOARD = 'jet.dashboard.dashboard.DefaultAppIndexDashboard'
# Internationalization
# https://docs.djangoproject.com/en/1.10/topics/i18n/

@ -16,28 +16,4 @@ DEBUG_TOOLBAR_PANELS = (
'debug_toolbar.panels.redirects.RedirectsPanel',
)
# Logging settings
LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'filters': {
'require_debug_false': {
'()': 'django.utils.log.RequireDebugFalse'
}
},
'handlers': {
'mail_admins': {
'level': 'ERROR',
'filters': ['require_debug_false'],
'class': 'django.utils.log.AdminEmailHandler'
}
},
'loggers': {
'django.request': {
'handlers': ['mail_admins'],
'level': 'ERROR',
'propagate': True
}
}
}
DEFAULT_FROM_EMAIL = 'max.yakovenko2016@yandex.ru'

@ -6,7 +6,7 @@ ADMINS = (
)
MANAGERS = ADMINS
DEFAULT_FROM_EMAIL = 'notreply@russianprograms'
DEFAULT_FROM_EMAIL = 'order@russian-programs.ru'
# Logging
LOGGING['handlers']['production_file']['filename'] = os.path.join(os.path.dirname(BASE_DIR),'logs/eshop_main_prod.log')

Loading…
Cancel
Save