Skip to content

Commit 1afc5b6

Browse files
committed
Making custom user compatible
1 parent f77ae5c commit 1afc5b6

1 file changed

Lines changed: 12 additions & 18 deletions

File tree

conversejs/migrations/0001_initial.py

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,21 @@
44
from south.v2 import SchemaMigration
55
from django.db import models
66

7+
try:
8+
from django.contrib.auth import get_user_model
9+
except ImportError: # django < 1.5
10+
from django.contrib.auth.models import User
11+
else:
12+
User = get_user_model()
13+
714

815
class Migration(SchemaMigration):
916

1017
def forwards(self, orm):
1118
# Adding model 'XMPPAccount'
1219
db.create_table(u'conversejs_xmppaccount', (
1320
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
14-
('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='xmpp', to=orm['auth.User'])),
21+
('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm["%s.%s" % (User._meta.app_label, User._meta.object_name)])),
1522
('jid', self.gf('django.db.models.fields.CharField')(max_length=300)),
1623
('password', self.gf('django.db.models.fields.CharField')(max_length=1024)),
1724
))
@@ -37,21 +44,8 @@ def backwards(self, orm):
3744
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
3845
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
3946
},
40-
u'auth.user': {
41-
'Meta': {'object_name': 'User'},
42-
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
43-
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
44-
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
45-
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
46-
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
47-
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
48-
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
49-
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
50-
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
51-
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
52-
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
53-
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
54-
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
47+
"%s.%s" % (User._meta.app_label, User._meta.module_name): {
48+
'Meta': {'object_name': User.__name__},
5549
},
5650
u'contenttypes.contenttype': {
5751
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
@@ -65,8 +59,8 @@ def backwards(self, orm):
6559
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
6660
'jid': ('django.db.models.fields.CharField', [], {'max_length': '300'}),
6761
'password': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
68-
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'xmpp'", 'to': u"orm['auth.User']"})
62+
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['%s.%s']"% (User._meta.app_label, User._meta.object_name)})
6963
}
7064
}
7165

72-
complete_apps = ['conversejs']
66+
complete_apps = ['conversejs']

0 commit comments

Comments
 (0)