From f4a16a66d37c8c499d968802a305451c9341e656 Mon Sep 17 00:00:00 2001 From: Dmitriy Shesterkin Date: Thu, 4 May 2017 09:25:15 +0300 Subject: [PATCH] fix migration, comment for transfer on Django 1.9 --- DockerMakefile | 3 --- src/docs/views/ajax.py | 2 ++ src/myauth/migrations/0001_initial.py | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DockerMakefile b/DockerMakefile index ae0048b..d88e71f 100644 --- a/DockerMakefile +++ b/DockerMakefile @@ -17,9 +17,6 @@ stop: docker-compose stop migrate: - docker-compose run webpython src/manage.py migrate contenttypes - docker-compose run web python src/manage.py migrate sites - docker-compose run web python src/manage.py migrate myauth docker-compose run web python src/manage.py migrate loaddata: diff --git a/src/docs/views/ajax.py b/src/docs/views/ajax.py index 8fc8ae6..0b58f74 100644 --- a/src/docs/views/ajax.py +++ b/src/docs/views/ajax.py @@ -4,6 +4,8 @@ import simplejson as json from django.shortcuts import render, get_object_or_404, redirect from django.http import HttpResponseBadRequest, HttpResponse from django.core import serializers + +# use django.apps.apps.get_model since Django 1.9 from django.db.models.loading import get_model from django.views.decorators.csrf import csrf_protect diff --git a/src/myauth/migrations/0001_initial.py b/src/myauth/migrations/0001_initial.py index aaed35c..a4875c8 100644 --- a/src/myauth/migrations/0001_initial.py +++ b/src/myauth/migrations/0001_initial.py @@ -10,6 +10,7 @@ import django.core.validators class Migration(migrations.Migration): dependencies = [ + ('sites', '0001_initial'), ('auth', '0006_require_contenttypes_0002'), ('customer', '0001_initial'), ]