Download as
Browse Code »

Commit d3f9b27b32f3776528c96f67260625784473c023

Authored by Sergio Oliveira
1 parent 4eba4a7a
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Replacing user profile by Custom User model

Showing 6 changed files with 401 additions and 24 deletions   Show diff stats
src/accounts/migrations/0001_rename_auth_user_to_accounts_user.py 0 → 100644
  Diff comments   View file @d3f9b27
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
  1 +# -*- coding: utf-8 -*-
  2 +import datetime
  3 +from south.db import db
  4 +from south.v2 import SchemaMigration
  5 +from django.db import models
  6 +
  7 +
  8 +class Migration(SchemaMigration):
  9 +
  10 + def forwards(self, orm):
  11 + db.rename_table('auth_user', 'accounts_user')
  12 + db.rename_table('auth_user_groups', 'accounts_user_groups')
  13 + db.rename_table('auth_user_user_permissions', 'accounts_user_user_permissions')
  14 +
  15 + def backwards(self, orm):
  16 + db.rename_table('accounts_user', 'auth_user')
  17 + db.rename_table('accounts_user_groups', 'auth_user_groups')
  18 + db.rename_table('accounts_user_user_permissions', 'auth_user_user_permissions')
  19 +
  20 + models = {
  21 + u'accounts.user': {
  22 + 'Meta': {'object_name': 'User'},
  23 + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  24 + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
  25 + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  26 + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
  27 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  28 + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
  29 + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  30 + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  31 + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  32 + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  33 + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
  34 + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
  35 + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
  36 + },
  37 + u'auth.group': {
  38 + 'Meta': {'object_name': 'Group'},
  39 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  40 + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
  41 + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
  42 + },
  43 + u'auth.permission': {
  44 + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
  45 + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  46 + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
  47 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  48 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
  49 + },
  50 + u'contenttypes.contenttype': {
  51 + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
  52 + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  53 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  54 + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  55 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
  56 + }
  57 + }
  58 +
  59 + complete_apps = ['accounts']
src/accounts/migrations/0002_delete_sussumu_dup.py 0 → 100644
  Diff comments   View file @d3f9b27
@@ -0,0 +1,135 @@ @@ -0,0 +1,135 @@
  1 +# -*- coding: utf-8 -*-
  2 +import datetime
  3 +from south.db import db
  4 +from south.v2 import DataMigration
  5 +from django.db import models
  6 +
  7 +class Migration(DataMigration):
  8 +
  9 + def forwards(self, orm):
  10 + sussumu = orm['accounts.User'].objects.get(username='Sussumu')
  11 + profile = orm['super_archives.UserProfile'].objects.get(user_id=sussumu.pk)
  12 + sussumu.delete()
  13 + profile.delete()
  14 +
  15 + def backwards(self, orm):
  16 + "Write your backwards methods here."
  17 +
  18 + models = {
  19 + u'accounts.user': {
  20 + 'Meta': {'object_name': 'User'},
  21 + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  22 + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
  23 + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  24 + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
  25 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  26 + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
  27 + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  28 + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  29 + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  30 + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  31 + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
  32 + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
  33 + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
  34 + },
  35 + u'auth.group': {
  36 + 'Meta': {'object_name': 'Group'},
  37 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  38 + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
  39 + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
  40 + },
  41 + u'auth.permission': {
  42 + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
  43 + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  44 + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
  45 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  46 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
  47 + },
  48 + u'contenttypes.contenttype': {
  49 + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
  50 + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  51 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  52 + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  53 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
  54 + },
  55 + u'super_archives.emailaddress': {
  56 + 'Meta': {'object_name': 'EmailAddress'},
  57 + 'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
  58 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  59 + 'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
  60 + 'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
  61 + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': u"orm['accounts.User']"})
  62 + },
  63 + u'super_archives.mailinglist': {
  64 + 'Meta': {'object_name': 'MailingList'},
  65 + 'description': ('django.db.models.fields.TextField', [], {}),
  66 + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
  67 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  68 + 'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
  69 + 'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
  70 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
  71 + },
  72 + u'super_archives.mailinglistmembership': {
  73 + 'Meta': {'object_name': 'MailingListMembership'},
  74 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  75 + 'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
  76 + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
  77 + },
  78 + u'super_archives.message': {
  79 + 'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
  80 + 'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
  81 + 'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
  82 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  83 + 'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
  84 + 'received_time': ('django.db.models.fields.DateTimeField', [], {}),
  85 + 'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  86 + 'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
  87 + 'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
  88 + 'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
  89 + },
  90 + u'super_archives.messagemetadata': {
  91 + 'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
  92 + 'Meta': {'object_name': 'MessageMetadata'},
  93 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  94 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
  95 + 'value': ('django.db.models.fields.TextField', [], {})
  96 + },
  97 + u'super_archives.pagehit': {
  98 + 'Meta': {'object_name': 'PageHit'},
  99 + 'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
  100 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  101 + 'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
  102 + },
  103 + u'super_archives.thread': {
  104 + 'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
  105 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  106 + 'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
  107 + 'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
  108 + 'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
  109 + 'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  110 + 'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
  111 + },
  112 + u'super_archives.userprofile': {
  113 + 'Meta': {'object_name': 'UserProfile'},
  114 + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  115 + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
  116 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  117 + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  118 + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  119 + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  120 + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['accounts.User']", 'unique': 'True'}),
  121 + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
  122 + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'})
  123 + },
  124 + u'super_archives.vote': {
  125 + 'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
  126 + 'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
  127 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  128 + 'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
  129 + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
  130 + }
  131 + }
  132 +
  133 + complete_apps = ['accounts', 'super_archives']
  134 + symmetrical = True
  135 +
src/accounts/migrations/0003_auto__add_field_user_institution__add_field_user_role__add_field_user_.py 0 → 100644
  Diff comments   View file @d3f9b27
@@ -0,0 +1,122 @@ @@ -0,0 +1,122 @@
  1 +# -*- coding: utf-8 -*-
  2 +import datetime
  3 +from south.db import db
  4 +from south.v2 import SchemaMigration
  5 +from django.db import models
  6 +
  7 +
  8 +class Migration(SchemaMigration):
  9 +
  10 + def forwards(self, orm):
  11 + # Adding field 'User.institution'
  12 + db.add_column(u'accounts_user', 'institution',
  13 + self.gf('django.db.models.fields.CharField')(max_length=128, null=True),
  14 + keep_default=False)
  15 +
  16 + # Adding field 'User.role'
  17 + db.add_column(u'accounts_user', 'role',
  18 + self.gf('django.db.models.fields.CharField')(max_length=128, null=True),
  19 + keep_default=False)
  20 +
  21 + # Adding field 'User.twitter'
  22 + db.add_column(u'accounts_user', 'twitter',
  23 + self.gf('django.db.models.fields.CharField')(max_length=128, null=True),
  24 + keep_default=False)
  25 +
  26 + # Adding field 'User.facebook'
  27 + db.add_column(u'accounts_user', 'facebook',
  28 + self.gf('django.db.models.fields.CharField')(max_length=128, null=True),
  29 + keep_default=False)
  30 +
  31 + # Adding field 'User.google_talk'
  32 + db.add_column(u'accounts_user', 'google_talk',
  33 + self.gf('django.db.models.fields.EmailField')(max_length=75, null=True),
  34 + keep_default=False)
  35 +
  36 + # Adding field 'User.webpage'
  37 + db.add_column(u'accounts_user', 'webpage',
  38 + self.gf('django.db.models.fields.CharField')(max_length=256, null=True),
  39 + keep_default=False)
  40 +
  41 + # Adding field 'User.verification_hash'
  42 + db.add_column(u'accounts_user', 'verification_hash',
  43 + self.gf('django.db.models.fields.CharField')(max_length=32, null=True),
  44 + keep_default=False)
  45 +
  46 + # Adding unique constraint on 'User', fields ['email']
  47 + db.create_unique(u'accounts_user', ['email'])
  48 +
  49 +
  50 + def backwards(self, orm):
  51 + # Removing unique constraint on 'User', fields ['email']
  52 + db.delete_unique(u'accounts_user', ['email'])
  53 +
  54 + # Deleting field 'User.institution'
  55 + db.delete_column(u'accounts_user', 'institution')
  56 +
  57 + # Deleting field 'User.role'
  58 + db.delete_column(u'accounts_user', 'role')
  59 +
  60 + # Deleting field 'User.twitter'
  61 + db.delete_column(u'accounts_user', 'twitter')
  62 +
  63 + # Deleting field 'User.facebook'
  64 + db.delete_column(u'accounts_user', 'facebook')
  65 +
  66 + # Deleting field 'User.google_talk'
  67 + db.delete_column(u'accounts_user', 'google_talk')
  68 +
  69 + # Deleting field 'User.webpage'
  70 + db.delete_column(u'accounts_user', 'webpage')
  71 +
  72 + # Deleting field 'User.verification_hash'
  73 + db.delete_column(u'accounts_user', 'verification_hash')
  74 +
  75 +
  76 + models = {
  77 + u'accounts.user': {
  78 + 'Meta': {'object_name': 'User'},
  79 + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  80 + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
  81 + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  82 + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  83 + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
  84 + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
  85 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  86 + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  87 + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
  88 + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  89 + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  90 + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  91 + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  92 + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
  93 + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  94 + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  95 + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
  96 + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
  97 + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
  98 + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'})
  99 + },
  100 + u'auth.group': {
  101 + 'Meta': {'object_name': 'Group'},
  102 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  103 + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
  104 + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
  105 + },
  106 + u'auth.permission': {
  107 + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
  108 + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  109 + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
  110 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  111 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
  112 + },
  113 + u'contenttypes.contenttype': {
  114 + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
  115 + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  116 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  117 + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  118 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
  119 + }
  120 + }
  121 +
  122 + complete_apps = ['accounts']
0 \ No newline at end of file 123 \ No newline at end of file
src/accounts/migrations/0004_copy_profile_data.py 0 → 100644
  Diff comments   View file @d3f9b27
@@ -0,0 +1,81 @@ @@ -0,0 +1,81 @@
  1 +# -*- coding: utf-8 -*-
  2 +import datetime
  3 +from south.db import db
  4 +from south.v2 import DataMigration
  5 +from django.db import models
  6 +
  7 +class Migration(DataMigration):
  8 +
  9 + def forwards(self, orm):
  10 + fields = ('institution', 'role', 'twitter', 'facebook',
  11 + 'google_talk', 'webpage')
  12 +
  13 + for userprofile in orm['super_archives.UserProfile'].objects.iterator():
  14 + user = orm['accounts.User'].objects.get(id=userprofile.user_id)
  15 + for field in fields:
  16 + setattr(user, field, getattr(userprofile, field))
  17 + user.save()
  18 +
  19 + def backwards(self, orm):
  20 + "Write your backwards methods here."
  21 +
  22 + models = {
  23 + u'accounts.user': {
  24 + 'Meta': {'object_name': 'User'},
  25 + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  26 + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
  27 + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  28 + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  29 + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
  30 + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
  31 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  32 + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  33 + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
  34 + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  35 + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  36 + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  37 + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  38 + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
  39 + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  40 + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  41 + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
  42 + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
  43 + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
  44 + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'})
  45 + },
  46 + u'auth.group': {
  47 + 'Meta': {'object_name': 'Group'},
  48 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  49 + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
  50 + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
  51 + },
  52 + u'auth.permission': {
  53 + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
  54 + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  55 + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
  56 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  57 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
  58 + },
  59 + u'contenttypes.contenttype': {
  60 + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
  61 + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  62 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  63 + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  64 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
  65 + },
  66 + u'super_archives.userprofile': {
  67 + 'Meta': {'object_name': 'UserProfile'},
  68 + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  69 + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
  70 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  71 + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  72 + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  73 + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
  74 + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['accounts.User']", 'unique': 'True'}),
  75 + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
  76 + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'})
  77 + }
  78 + }
  79 +
  80 + complete_apps = ['accounts']
  81 + symmetrical = True
src/accounts/migrations/__init__.py 0 → 100644
  Diff comments   View file @d3f9b27
src/super_archives/models.py
  Diff comments   View file @d3f9b27
@@ -5,11 +5,14 @@ from hashlib import md5 @@ -5,11 +5,14 @@ from hashlib import md5
5 from django.db import models 5 from django.db import models
6 from django.conf import settings 6 from django.conf import settings
7 from django.utils import timezone 7 from django.utils import timezone
8 -from django.contrib.auth.models import User 8 +from django.contrib.auth import get_user_model
9 from django.core.urlresolvers import reverse, NoReverseMatch 9 from django.core.urlresolvers import reverse, NoReverseMatch
10 from django.utils.translation import ugettext_lazy as _ 10 from django.utils.translation import ugettext_lazy as _
11 11
12 12
  13 +User = get_user_model()
  14 +
  15 +
13 class NotSpamManager(models.Manager): 16 class NotSpamManager(models.Manager):
14 """Only return objects which are not marked as spam.""" 17 """Only return objects which are not marked as spam."""
15 18
@@ -50,29 +53,6 @@ class EmailAddress(models.Model): @@ -50,29 +53,6 @@ class EmailAddress(models.Model):
50 return '"%s" <%s>' % (self.get_full_name(), self.address) 53 return '"%s" <%s>' % (self.get_full_name(), self.address)
51 54
52 55
53 -class UserProfile(models.Model):  
54 -  
55 - user = models.OneToOneField(User, unique=True)  
56 - institution = models.CharField(max_length=128, null=True)  
57 - role = models.CharField(max_length=128, null=True)  
58 - twitter = models.CharField(max_length=128, null=True)  
59 - facebook = models.CharField(max_length=128, null=True)  
60 - google_talk = models.EmailField(null=True)  
61 - webpage = models.CharField(max_length=256, null=True)  
62 - verification_hash = models.CharField(max_length=32, null=True)  
63 -  
64 - class Meta:  
65 - verbose_name = _(u"User Profile")  
66 - verbose_name_plural = _(u"Users Profiles")  
67 -  
68 - def __unicode__(self):  
69 - return '"%s" <%s>' % (self.user.get_full_name(), self.user.email)  
70 -  
71 -# This does the same the same than related_name argument but it also creates  
72 -# a profile in the case it doesn't exist yet.  
73 -User.profile = property(lambda u: UserProfile.objects.get_or_create(user=u)[0])  
74 -  
75 -  
76 class MailingList(models.Model): 56 class MailingList(models.Model):
77 name = models.CharField(max_length=80) 57 name = models.CharField(max_length=80)
78 email = models.EmailField() 58 email = models.EmailField()