# HG changeset patch # User ymh # Date 1493371035 -7200 # Node ID ca1c0a625d705a8d0c59d579c4e90e6935c475fb # Parent 46e812f74e31e8da3301a12fc4618f15bd377d63 Clean overridable property in settings, and change installed app order to ensure the correct template overriding diff -r 46e812f74e31 -r ca1c0a625d70 src/iconolab/settings/__init__.py --- a/src/iconolab/settings/__init__.py Thu Apr 27 22:15:23 2017 +0200 +++ b/src/iconolab/settings/__init__.py Fri Apr 28 11:17:15 2017 +0200 @@ -43,6 +43,7 @@ # Application definition INSTALLED_APPS = [ + 'iconolab.apps.IconolabApp', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -53,7 +54,6 @@ 'django_comments', 'django_comments_xtd', 'haystack', - 'iconolab.apps.IconolabApp', 'sorl.thumbnail', 'notifications' ] diff -r 46e812f74e31 -r ca1c0a625d70 src/iconolab/settings/dev.py.tmpl --- a/src/iconolab/settings/dev.py.tmpl Thu Apr 27 22:15:23 2017 +0200 +++ b/src/iconolab/settings/dev.py.tmpl Fri Apr 28 11:17:15 2017 +0200 @@ -62,23 +62,6 @@ # Application definition -INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'django.contrib.sites', - 'django_comments', - 'django_comments_xtd', - 'haystack', - 'iconolab.apps.IconolabApp', - 'sorl.thumbnail', - 'notifications', -] - - COMMENTS_APP = "django_comments_xtd" COMMENTS_XTD_MODEL = "iconolab.models.IconolabComment" @@ -88,17 +71,6 @@ SITE_ID = 1 -MIDDLEWARE_CLASSES = [ - 'django.middleware.security.SecurityMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', -] - ROOT_URLCONF = 'iconolab.urls' TEMPLATES = [