Download as
Browse Code »

Commit 87417a3d1c5febd7ee500d839b25601c0eb2de2a

Authored by Luan
2 parents 89866521 60cf6273
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

Merge branch 'master' of github.com:TracyWebTech/colab

Showing 2 changed files with 80 additions and 0 deletions   Show diff stats
src/accounts/migrations/0007_remove_at_from_username.py 0 → 100644
  Diff comments   View file @87417a3
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
  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 + "Write your forwards methods here."
  11 + # Note: Don't use "from appname.models import ModelName".
  12 + # Use orm.ModelName to refer to models in this application,
  13 + # and orm['appname.ModelName'] for models in other applications.
  14 + for u in orm.User.objects.filter(username__contains='@'):
  15 + u.username = u.username.split('@')[0]
  16 + u.save()
  17 +
  18 + def backwards(self, orm):
  19 + pass
  20 +
  21 + models = {
  22 + u'accounts.user': {
  23 + 'Meta': {'object_name': 'User'},
  24 + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  25 + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
  26 + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  27 + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  28 + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
  29 + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
  30 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  31 + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  32 + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
  33 + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  34 + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  35 + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  36 + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  37 + 'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
  38 + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
  39 + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  40 + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  41 + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
  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', 'blank': 'True'}),
  44 + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': '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 + }
  67 +
  68 + complete_apps = ['accounts']
  69 + symmetrical = True
src/accounts/models.py
  Diff comments   View file @87417a3
@@ -5,7 +5,9 @@ import urlparse @@ -5,7 +5,9 @@ import urlparse
5 from django.db import models, DatabaseError 5 from django.db import models, DatabaseError
6 from django.contrib.auth.hashers import check_password 6 from django.contrib.auth.hashers import check_password
7 from django.contrib.auth.models import AbstractUser 7 from django.contrib.auth.models import AbstractUser
  8 +from django.core import validators
8 from django.core.urlresolvers import reverse 9 from django.core.urlresolvers import reverse
  10 +from django.utils.translation import ugettext_lazy as _
9 11
10 from conversejs import xmpp 12 from conversejs import xmpp
11 13
@@ -50,3 +52,12 @@ class User(AbstractUser): @@ -50,3 +52,12 @@ class User(AbstractUser):
50 # The following workaroud allows to change email field to unique 52 # The following workaroud allows to change email field to unique
51 # without having to rewrite all AbstractUser here 53 # without having to rewrite all AbstractUser here
52 User._meta.get_field('email')._unique = True 54 User._meta.get_field('email')._unique = True
  55 +User._meta.get_field('username').help_text = _(
  56 + u'Required. 30 characters or fewer. Letters, digits and '
  57 + u'./+/-/_ only.'
  58 +)
  59 +User._meta.get_field('username').validators[0] = validators.RegexValidator(
  60 + r'^[\w.+-]+$',
  61 + _('Enter a valid username.'),
  62 + 'invalid'
  63 +)