oxuser/user
This commit is contained in:
parent
86bc388193
commit
82de415cc6
2 changed files with 25 additions and 25 deletions
|
@ -2,40 +2,40 @@
|
||||||
|
|
||||||
from south.db import db
|
from south.db import db
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from oxuser.models import *
|
from user.models import *
|
||||||
|
|
||||||
class Migration:
|
class Migration:
|
||||||
|
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
|
|
||||||
# Adding model 'Preference'
|
# Adding model 'Preference'
|
||||||
db.create_table('oxuser_preference', (
|
db.create_table('user_preference', (
|
||||||
('id', orm['oxuser.Preference:id']),
|
('id', orm['user.Preference:id']),
|
||||||
('user', orm['oxuser.Preference:user']),
|
('user', orm['user.Preference:user']),
|
||||||
('created', orm['oxuser.Preference:created']),
|
('created', orm['user.Preference:created']),
|
||||||
('modified', orm['oxuser.Preference:modified']),
|
('modified', orm['user.Preference:modified']),
|
||||||
('key', orm['oxuser.Preference:key']),
|
('key', orm['user.Preference:key']),
|
||||||
('value', orm['oxuser.Preference:value']),
|
('value', orm['user.Preference:value']),
|
||||||
))
|
))
|
||||||
db.send_create_signal('oxuser', ['Preference'])
|
db.send_create_signal('user', ['Preference'])
|
||||||
|
|
||||||
# Adding model 'UserProfile'
|
# Adding model 'UserProfile'
|
||||||
db.create_table('oxuser_userprofile', (
|
db.create_table('user_userprofile', (
|
||||||
('id', orm['oxuser.UserProfile:id']),
|
('id', orm['user.UserProfile:id']),
|
||||||
('recover_key', orm['oxuser.UserProfile:recover_key']),
|
('recover_key', orm['user.UserProfile:recover_key']),
|
||||||
('user', orm['oxuser.UserProfile:user']),
|
('user', orm['user.UserProfile:user']),
|
||||||
))
|
))
|
||||||
db.send_create_signal('oxuser', ['UserProfile'])
|
db.send_create_signal('user', ['UserProfile'])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
|
|
||||||
# Deleting model 'Preference'
|
# Deleting model 'Preference'
|
||||||
db.delete_table('oxuser_preference')
|
db.delete_table('user_preference')
|
||||||
|
|
||||||
# Deleting model 'UserProfile'
|
# Deleting model 'UserProfile'
|
||||||
db.delete_table('oxuser_userprofile')
|
db.delete_table('user_userprofile')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,7 +74,7 @@ class Migration:
|
||||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||||
},
|
},
|
||||||
'oxuser.preference': {
|
'user.preference': {
|
||||||
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
||||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
'key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
|
'key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
|
||||||
|
@ -82,11 +82,11 @@ class Migration:
|
||||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'preferences'", 'to': "orm['auth.User']"}),
|
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'preferences'", 'to': "orm['auth.User']"}),
|
||||||
'value': ('django.db.models.fields.TextField', [], {'blank': 'True'})
|
'value': ('django.db.models.fields.TextField', [], {'blank': 'True'})
|
||||||
},
|
},
|
||||||
'oxuser.userprofile': {
|
'user.userprofile': {
|
||||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
'recover_key': ('django.db.models.fields.TextField', [], {}),
|
'recover_key': ('django.db.models.fields.TextField', [], {}),
|
||||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
|
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'unique': 'True'})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ['oxuser']
|
complete_apps = ['user']
|
||||||
|
|
|
@ -2,21 +2,21 @@
|
||||||
|
|
||||||
from south.db import db
|
from south.db import db
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from oxuser.models import *
|
from user.models import *
|
||||||
|
|
||||||
class Migration:
|
class Migration:
|
||||||
|
|
||||||
def forwards(self, orm):
|
def forwards(self, orm):
|
||||||
|
|
||||||
# Adding field 'UserProfile.files_updated'
|
# Adding field 'UserProfile.files_updated'
|
||||||
db.add_column('oxuser_userprofile', 'files_updated', orm['oxuser.userprofile:files_updated'])
|
db.add_column('user_userprofile', 'files_updated', orm['user.userprofile:files_updated'])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def backwards(self, orm):
|
def backwards(self, orm):
|
||||||
|
|
||||||
# Deleting field 'UserProfile.files_updated'
|
# Deleting field 'UserProfile.files_updated'
|
||||||
db.delete_column('oxuser_userprofile', 'files_updated')
|
db.delete_column('user_userprofile', 'files_updated')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@ class Migration:
|
||||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||||
},
|
},
|
||||||
'oxuser.preference': {
|
'user.preference': {
|
||||||
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
||||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
'key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
|
'key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
|
||||||
|
@ -63,7 +63,7 @@ class Migration:
|
||||||
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'preferences'", 'to': "orm['auth.User']"}),
|
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'preferences'", 'to': "orm['auth.User']"}),
|
||||||
'value': ('django.db.models.fields.TextField', [], {'blank': 'True'})
|
'value': ('django.db.models.fields.TextField', [], {'blank': 'True'})
|
||||||
},
|
},
|
||||||
'oxuser.userprofile': {
|
'user.userprofile': {
|
||||||
'files_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
'files_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
'recover_key': ('django.db.models.fields.TextField', [], {}),
|
'recover_key': ('django.db.models.fields.TextField', [], {}),
|
||||||
|
@ -71,4 +71,4 @@ class Migration:
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
complete_apps = ['oxuser']
|
complete_apps = ['user']
|
||||||
|
|
Loading…
Reference in a new issue