Skip to content
This repository was archived by the owner on Dec 6, 2021. It is now read-only.

fixing the migration to go with the rest of the 1.5 user model changes #6

Open
tijs wants to merge 2 commits into
base: auth-user-model-changes
Choose a base branch
from
Open

fixing the migration to go with the rest of the 1.5 user model changes #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2b90fa
fixing the migration to go with the rest of the 1.5 user model changes
tijs Jul 31, 2013
4bfd4d0
removed unused imports
tijs Aug 1, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions userroles/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
# encoding: utf-8
import datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models

try:
from django.contrib.auth import get_user_model
except ImportError: # django < 1.5
from django.contrib.auth.models import User
else:
User = get_user_model()

user_orm_label = '%s.%s' % (User._meta.app_label, User._meta.object_name)
user_model_label = '%s.%s' % (User._meta.app_label, User._meta.module_name)


class Migration(SchemaMigration):

Expand All @@ -11,7 +20,7 @@ def forwards(self, orm):
# Adding model 'UserRole'
db.create_table('userroles_userrole', (
('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='role', unique=True, to=orm['auth.User'])),
('user', self.gf('django.db.models.fields.related.OneToOneField')(related_name='role', unique=True, to=orm[user_orm_label])),
('name', self.gf('django.db.models.fields.CharField')(max_length=100)),
('child', self.gf('django.db.models.fields.CharField')(max_length=100, blank=True)),
))
Expand All @@ -38,8 +47,8 @@ def backwards(self, orm):
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
'auth.user': {
'Meta': {'object_name': 'User'},
user_model_label: {
'Meta': {'object_name': User.__name__, 'db_table': "'%s'" % User._meta.db_table},
'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'}),
Expand All @@ -66,7 +75,7 @@ def backwards(self, orm):
'child': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'role'", 'unique': 'True', 'to': "orm['auth.User']"})
'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'role'", 'unique': 'True', 'to': "orm['%s']" % user_orm_label})
}
}

Expand Down