Backwards compatible for django < 1.5.

--HG--
branch : fix_migrations_for_custom_user_model
This commit is contained in:
shtimn@gmail.com 2014-08-11 20:54:27 +04:00
parent 6002ecb9e3
commit 6acfddc507
2 changed files with 18 additions and 6 deletions

View File

@ -4,16 +4,22 @@ from south.db import db
from south.v2 import SchemaMigration
from django.db import models
from django.conf import settings
from django.contrib.auth import get_user_model
from south import modelsinspector
try:
from django.contrib.auth import get_user_model
UserModel = get_user_model()
except ImportError:
from django.contrib.auth.models import User as UserModel
user_model = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding model 'DashboardPreferences'
db.create_table('admin_tools_dashboard_preferences', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
@ -24,7 +30,7 @@ class Migration(SchemaMigration):
def backwards(self, orm):
# Deleting model 'DashboardPreferences'
db.delete_table('admin_tools_dashboard_preferences')
@ -44,7 +50,7 @@ class Migration(SchemaMigration):
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
user_model: {
'Meta': modelsinspector.get_model_meta(get_user_model()),
'Meta': modelsinspector.get_model_meta(UserModel),
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),

View File

@ -5,7 +5,13 @@ from south.v2 import SchemaMigration
from django.db import models
from django.conf import settings
from south import modelsinspector
from django.contrib.auth import get_user_model
try:
from django.contrib.auth import get_user_model
UserModel = get_user_model()
except ImportError:
from django.contrib.auth.models import User as UserModel
user_model = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
@ -43,7 +49,7 @@ class Migration(SchemaMigration):
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
user_model: {
'Meta': modelsinspector.get_model_meta(get_user_model()),
'Meta': modelsinspector.get_model_meta(UserModel),
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),