Make user profile a OneToOneField
We had this set up as a unique ForeignKey before, which adds some indirection due to the RelatedManager object being there. By making it a OneToOneField, we can get the profile object directly, enforce uniqueness, and also use it in select_related() calls to make our profiles page a bit more efficient. Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee
parent
e847030d83
commit
82eb9de993
@ -130,7 +130,7 @@ def find_user(userstring):
|
||||
def user_email():
|
||||
return User.objects.get(email=email)
|
||||
def profile_email():
|
||||
return User.objects.get(userprofile_user__public_email=email)
|
||||
return User.objects.get(userprofile__public_email=email)
|
||||
def user_name():
|
||||
# yes, a bit odd but this is the easiest way since we can't always be
|
||||
# sure how to split the name. Ensure every 'token' appears in at least
|
||||
|
||||
151
main/migrations/0036_auto__chg_field_userprofile_user.py
Normal file
151
main/migrations/0036_auto__chg_field_userprofile_user.py
Normal file
@ -0,0 +1,151 @@
|
||||
# encoding: utf-8
|
||||
import datetime
|
||||
from south.db import db
|
||||
from south.v2 import SchemaMigration
|
||||
from django.db import models
|
||||
|
||||
class Migration(SchemaMigration):
|
||||
|
||||
def forwards(self, orm):
|
||||
db.alter_column('user_profiles', 'user_id', self.gf('django.db.models.fields.related.OneToOneField')(unique=True, to=orm['auth.User']))
|
||||
|
||||
def backwards(self, orm):
|
||||
db.alter_column('user_profiles', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(unique=True, to=orm['auth.User']))
|
||||
|
||||
models = {
|
||||
'auth.group': {
|
||||
'Meta': {'object_name': 'Group'},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
|
||||
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||
},
|
||||
'auth.permission': {
|
||||
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
|
||||
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
|
||||
},
|
||||
'auth.user': {
|
||||
'Meta': {'object_name': 'User'},
|
||||
'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'}),
|
||||
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
|
||||
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
|
||||
},
|
||||
'contenttypes.contenttype': {
|
||||
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
|
||||
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||
},
|
||||
'main.arch': {
|
||||
'Meta': {'ordering': "['name']", 'object_name': 'Arch', 'db_table': "'arches'"},
|
||||
'agnostic': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
|
||||
},
|
||||
'main.donor': {
|
||||
'Meta': {'ordering': "['name']", 'object_name': 'Donor', 'db_table': "'donors'"},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
|
||||
'visible': ('django.db.models.fields.BooleanField', [], {'default': 'True'})
|
||||
},
|
||||
'main.package': {
|
||||
'Meta': {'ordering': "('pkgname',)", 'object_name': 'Package', 'db_table': "'packages'"},
|
||||
'arch': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'packages'", 'to': "orm['main.Arch']"}),
|
||||
'build_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
|
||||
'compressed_size': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
|
||||
'filename': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||
'files_last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
|
||||
'flag_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'installed_size': ('django.db.models.fields.BigIntegerField', [], {'null': 'True'}),
|
||||
'last_update': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
|
||||
'license': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
|
||||
'packager': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}),
|
||||
'packager_str': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||
'pkgbase': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
|
||||
'pkgdesc': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
|
||||
'pkgname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
|
||||
'pkgrel': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||
'pkgver': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||
'repo': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'packages'", 'to': "orm['main.Repo']"}),
|
||||
'url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
|
||||
},
|
||||
'main.packagedepend': {
|
||||
'Meta': {'object_name': 'PackageDepend', 'db_table': "'package_depends'"},
|
||||
'depname': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
|
||||
'depvcmp': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'pkg': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['main.Package']"})
|
||||
},
|
||||
'main.packagefile': {
|
||||
'Meta': {'object_name': 'PackageFile', 'db_table': "'package_files'"},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||
'pkg': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['main.Package']"})
|
||||
},
|
||||
'main.repo': {
|
||||
'Meta': {'ordering': "['name']", 'object_name': 'Repo', 'db_table': "'repos'"},
|
||||
'bugs_project': ('django.db.models.fields.SmallIntegerField', [], {'default': '1'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
|
||||
'svn_root': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
|
||||
'testing': ('django.db.models.fields.BooleanField', [], {'default': 'False'})
|
||||
},
|
||||
'main.signoff': {
|
||||
'Meta': {'object_name': 'Signoff'},
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'packager': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
|
||||
'pkg': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['main.Package']"}),
|
||||
'pkgrel': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||
'pkgver': ('django.db.models.fields.CharField', [], {'max_length': '255'})
|
||||
},
|
||||
'main.todolist': {
|
||||
'Meta': {'object_name': 'Todolist', 'db_table': "'todolists'"},
|
||||
'creator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
|
||||
'date_added': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
|
||||
'description': ('django.db.models.fields.TextField', [], {}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
|
||||
},
|
||||
'main.todolistpkg': {
|
||||
'Meta': {'unique_together': "(('list', 'pkg'),)", 'object_name': 'TodolistPkg', 'db_table': "'todolist_pkgs'"},
|
||||
'complete': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'list': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['main.Todolist']"}),
|
||||
'pkg': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['main.Package']"})
|
||||
},
|
||||
'main.userprofile': {
|
||||
'Meta': {'object_name': 'UserProfile', 'db_table': "'user_profiles'"},
|
||||
'alias': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
|
||||
'allowed_repos': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['main.Repo']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||
'favorite_distros': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
|
||||
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||
'interests': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
|
||||
'languages': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
|
||||
'location': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
|
||||
'notify': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||
'occupation': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
|
||||
'other_contact': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
|
||||
'picture': ('django.db.models.fields.files.FileField', [], {'default': "'devs/silhouette.png'", 'max_length': '100'}),
|
||||
'public_email': ('django.db.models.fields.CharField', [], {'max_length': '50'}),
|
||||
'roles': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
|
||||
'user': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'userprofile'", 'unique': 'True', 'to': "orm['auth.User']"}),
|
||||
'website': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
|
||||
'yob': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
|
||||
}
|
||||
}
|
||||
|
||||
complete_apps = ['main']
|
||||
@ -27,8 +27,7 @@ class UserProfile(models.Model):
|
||||
roles = models.CharField(max_length=255, null=True, blank=True)
|
||||
favorite_distros = models.CharField(max_length=255, null=True, blank=True)
|
||||
picture = models.FileField(upload_to='devs', default='devs/silhouette.png')
|
||||
user = models.ForeignKey(
|
||||
User, related_name='userprofile_user', unique=True)
|
||||
user = models.OneToOneField(User, related_name='userprofile')
|
||||
allowed_repos = models.ManyToManyField('Repo', blank=True)
|
||||
class Meta:
|
||||
db_table = 'user_profiles'
|
||||
|
||||
@ -43,7 +43,7 @@ def update(request):
|
||||
mode = 'disown'
|
||||
|
||||
if mode:
|
||||
repos = request.user.userprofile_user.all()[0].allowed_repos.all()
|
||||
repos = request.user.userprofile.allowed_repos.all()
|
||||
pkgs = Package.objects.filter(id__in=ids, repo__in=repos)
|
||||
disallowed_pkgs = Package.objects.filter(id__in=ids).exclude(
|
||||
repo__in=repos)
|
||||
|
||||
@ -18,7 +18,7 @@ def index(request):
|
||||
return direct_to_template(request, 'public/index.html', context)
|
||||
|
||||
def userlist(request, type='Developers'):
|
||||
users = User.objects.order_by('username')
|
||||
users = User.objects.order_by('username').select_related('userprofile')
|
||||
if type == 'Developers':
|
||||
users = users.filter(is_active=True, groups__name="Developers")
|
||||
msg = "This is a list of the current Arch Linux Developers. They maintain the [core] and [extra] package repositories in addition to doing any other developer duties."
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
<table class="arch-bio-entry">
|
||||
{% for dev in dev_list %}
|
||||
{% with dev.get_profile as prof %}
|
||||
{% with dev.userprofile as prof %}
|
||||
<tr>
|
||||
<td class="pic pic-{{ dev.username }}">
|
||||
<img src="{{ prof.picture.url }}" height="125" width="125" alt="Image for {{ prof.alias }}"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user