Merge lp:~dholbach/ubucon-site/fix-migration-paths into lp:ubucon-site

[Daniel Holbach]

[lp:~dholbach/ubucon-site/fix-migration-paths]

42. By Daniel Holbach on 2016-04-25

move TEMPLATE_DEBUG and TEMPLATE_LOADERS to new template fields

43. By Daniel Holbach on 2016-04-25

remove APP_DIRS, clashes with template loaders

44. By Daniel Holbach on 2016-04-25

add auto migration

=== added file 'ubucon_site/migrations/0002_auto_20160425_1408.py'
--- ubucon_site/migrations/0002_auto_20160425_1408.py	1970-01-01 00:00:00 +0000
+++ ubucon_site/migrations/0002_auto_20160425_1408.py	2016-04-25 14:11:01 +0000
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ubucon_site', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='rawhtml',
+            name='cmsplugin_ptr',
+            field=models.OneToOneField(parent_link=True, related_name='ubucon_site_rawhtml', primary_key=True, serialize=False, to='cms.CMSPlugin'),
+        ),
+    ]

=== modified file 'ubucon_site/settings/__init__.py'
--- ubucon_site/settings/__init__.py	2016-03-30 08:21:27 +0000
+++ ubucon_site/settings/__init__.py	2016-04-25 14:11:01 +0000
@@ -28,7 +28,6 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = True
 
 ALLOWED_HOSTS = []
 
@@ -86,7 +85,6 @@
         'DIRS': [
             os.path.join(BASE_DIR, 'templates'),
         ],
-        'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
                 'django.template.context_processors.request',
@@ -104,19 +102,18 @@
                 # For Aldryn
                 'aldryn_boilerplates.context_processors.boilerplate',
             ],
+            'loaders': [
+                'django.template.loaders.filesystem.Loader',
+                'aldryn_boilerplates.template_loaders.AppDirectoriesLoader',
+                'django.template.loaders.app_directories.Loader',
+                'django.template.loaders.eggs.Loader',
+            ],
+            'debug': True,
         },
     },
 ]
 
 
-TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'aldryn_boilerplates.template_loaders.AppDirectoriesLoader',
-    'django.template.loaders.app_directories.Loader',
-    'django.template.loaders.eggs.Loader'
-)
-
-
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -241,16 +238,16 @@
 #}
 
 MIGRATION_MODULES = {
-    'djangocms_column': 'djangocms_column.migrations_django',
-    'djangocms_flash': 'djangocms_flash.migrations_django',
-    'djangocms_googlemap': 'djangocms_googlemap.migrations_django',
-    'djangocms_inherit': 'djangocms_inherit.migrations_django',
-    'djangocms_link': 'djangocms_link.migrations_django',
-    'djangocms_style': 'djangocms_style.migrations_django',
-    'djangocms_file': 'djangocms_file.migrations_django',
-    'djangocms_picture': 'djangocms_picture.migrations_django',
-    'djangocms_teaser': 'djangocms_teaser.migrations_django',
-    'djangocms_video': 'djangocms_video.migrations_django'
+    'djangocms_column': 'djangocms_column.migrations',
+    'djangocms_flash': 'djangocms_flash.migrations',
+    'djangocms_googlemap': 'djangocms_googlemap.migrations',
+    'djangocms_inherit': 'djangocms_inherit.migrations',
+    'djangocms_link': 'djangocms_link.migrations',
+    'djangocms_style': 'djangocms_style.migrations',
+    'djangocms_file': 'djangocms_file.migrations',
+    'djangocms_picture': 'djangocms_picture.migrations',
+    'djangocms_teaser': 'djangocms_teaser.migrations',
+    'djangocms_video': 'djangocms_video.migrations',
 }
 
 AUTHENTICATION_BACKENDS = (