Added Primary Character field

app/sso/forms.py

@@ -124,3 +124,13 @@ class EmailChangeForm(forms.Form):
                 raise forms.ValidationError("The two e-mail fields didn't match.")
         return email2
 
+
+def CreatePrimaryCharacterForm(user):
+    """ Generate a Primary Character form populated with the user's characters """
+
+    chars = EVEPlayerCharacter.objects.filter(eveaccount__user=user)
+
+    class PrimaryCharacter(forms.Form):
+        character = forms.ModelChoiceField(queryset=chars, required=True, empty_label=None)
+
+    return PrimaryCharacter

app/sso/migrations/0007_auto__add_field_ssouser_primary_character.py

@@ -0,0 +1,186 @@
+# 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):
+        
+        # Adding field 'SSOUser.primary_character'
+        db.add_column('sso_ssouser', 'primary_character', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['eve_api.EVEPlayerCharacter'], null=True), keep_default=False)
+
+
+    def backwards(self, orm):
+        
+        # Deleting field 'SSOUser.primary_character'
+        db.delete_column('sso_ssouser', 'primary_character_id')
+
+
+    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'})
+        },
+        'eve_api.eveplayeralliance': {
+            'Meta': {'ordering': "['date_founded']", 'object_name': 'EVEPlayerAlliance'},
+            'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'date_founded': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'executor': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCorporation']", 'null': 'True', 'blank': 'True'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'member_count': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'ticker': ('django.db.models.fields.CharField', [], {'max_length': '15', 'blank': 'True'})
+        },
+        'eve_api.eveplayercharacter': {
+            'Meta': {'object_name': 'EVEPlayerCharacter'},
+            'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'attrib_charisma': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'attrib_intelligence': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'attrib_memory': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'attrib_perception': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'attrib_willpower': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'balance': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'corporation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCorporation']", 'null': 'True', 'blank': 'True'}),
+            'corporation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'current_location_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'gender': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'last_logoff': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
+            'race': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'roles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['eve_api.EVEPlayerCharacterRole']", 'null': 'True', 'blank': 'True'}),
+            'security_status': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'skills': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['eve_api.EVESkill']", 'through': "orm['eve_api.EVEPlayerCharacterSkill']", 'symmetrical': 'False'}),
+            'total_sp': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
+        },
+        'eve_api.eveplayercharacterrole': {
+            'Meta': {'object_name': 'EVEPlayerCharacterRole'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'roleid': ('django.db.models.fields.CharField', [], {'max_length': '64'})
+        },
+        'eve_api.eveplayercharacterskill': {
+            'Meta': {'object_name': 'EVEPlayerCharacterSkill'},
+            'character': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCharacter']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'in_training': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'level': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'skill': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVESkill']"}),
+            'skillpoints': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        'eve_api.eveplayercorporation': {
+            'Meta': {'object_name': 'EVEPlayerCorporation'},
+            'alliance': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerAlliance']", 'null': 'True', 'blank': 'True'}),
+            'alliance_join_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'api_last_updated': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'ceo_character': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCharacter']", 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.Group']", 'null': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'logo_color1': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'logo_color2': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'logo_color3': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'logo_graphic_id': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'logo_shape1': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'logo_shape2': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'logo_shape3': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'member_count': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'shares': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
+            'tax_rate': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
+            'ticker': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}),
+            'url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
+        'eve_api.eveskill': {
+            'Meta': {'object_name': 'EVESkill'},
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'group': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVESkillGroup']", 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        'eve_api.eveskillgroup': {
+            'Meta': {'object_name': 'EVESkillGroup'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
+        },
+        'sso.service': {
+            'Meta': {'ordering': "['id']", 'object_name': 'Service'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'api': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'settings_json': ('jsonfield.fields.JSONField', [], {'default': '{}', 'blank': 'True'}),
+            'url': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'})
+        },
+        'sso.serviceaccount': {
+            'Meta': {'ordering': "['user']", 'object_name': 'ServiceAccount'},
+            'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'character': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCharacter']", 'null': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sso.Service']"}),
+            'service_uid': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+        },
+        'sso.ssouser': {
+            'Meta': {'object_name': 'SSOUser'},
+            'api_service_password': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'primary_character': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['eve_api.EVEPlayerCharacter']", 'null': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"})
+        },
+        'sso.ssouseripaddress': {
+            'Meta': {'ordering': "['user']", 'object_name': 'SSOUserIPAddress'},
+            'first_seen': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'ip_address': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '200'}),
+            'last_seen': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ip_addresses'", 'to': "orm['auth.User']"})
+        },
+        'sso.ssousernote': {
+            'Meta': {'ordering': "['date_created']", 'object_name': 'SSOUserNote'},
+            'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}),
+            'date_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'note': ('django.db.models.fields.TextField', [], {}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'notes'", 'to': "orm['auth.User']"})
+        }
+    }
+
+    complete_apps = ['sso']

app/sso/models.py

@@ -33,6 +33,7 @@ class SSOUser(models.Model):
 
     user = models.ForeignKey(User, unique=True, related_name='profile')
 
+    primary_character = models.ForeignKey(EVEPlayerCharacter, null=True)
     api_service_password = models.CharField("API Services Password", max_length=200, blank=True)
 
     def __unicode__(self):

app/sso/templates/sso/primarycharchange.html

@@ -0,0 +1,19 @@
+{% extends "base.html" %}
+
+{% block title %}Change your Primay Character{% endblock %}
+
+{% block content %}
+<h1>Change Your Primary Character</h1>
+
+<p>Your primary character is used across auth services to show as your display name and corporation. Please set this to which character you consider your "main".</p>
+
+<form action="" method="post">
+<table>
+{{ form.as_table }}
+</table>
+<br />
+{% csrf_token %}
+<input type="submit" value="Change" />
+</form>
+
+{% endblock %}

app/sso/templates/sso/profile.html

@@ -44,12 +44,14 @@ function refresh_apikey(key) {
 <p>
 <b>Username:</b> {{ user.username }}<br/>
 <b>Email:</b> {{ user.email }}<br/>
+<b>Primary Character:</b> {{ user.get_profile.primary_character }}<br/>
 <b>Groups:</b> {{ user.groups.all|join:", " }}<br/>
 </p>
 <p>
 <a href="{% url sso.views.refresh_access %}" class="button">Update Access</a>
-<a href="{% url django.contrib.auth.views.password_change %}" class="button">Change Your Password</a>
-<a href="{% url sso.views.email_change %}" class="button">Change Your E-mail</a>
+<a href="{% url django.contrib.auth.views.password_change %}" class="button">Change Password</a>
+<a href="{% url sso.views.email_change %}" class="button">Change E-mail</a>
+<a href="{% url sso.views.primarychar_change %}" class="button">Change Primary Character</a>
 </p>
 
 <br/>

app/sso/urls.py

@@ -17,6 +17,7 @@ urlpatterns = patterns('',
     (r'^profile/refresh/(?P<userid>\d+)/', views.refresh_access),
     (r'^profile/change/password/$', password_change),
     (r'^profile/change/email/$', views.email_change),
+    (r'^profile/change/primary/$', views.primarychar_change),
     (r'^users/(?P<username>.*)/$', views.user_view),
     (r'^users/$', views.user_lookup),
 )

app/sso/views.py

@@ -22,7 +22,7 @@ from eve_api.tasks import import_apikey, import_apikey_result, update_user_acces
 from eve_proxy.models import ApiAccessLog
 
 from sso.models import ServiceAccount, Service, SSOUser, ExistingUser, ServiceError
-from sso.forms import UserServiceAccountForm, ServiceAccountResetForm, UserLookupForm, APIPasswordForm, EmailChangeForm
+from sso.forms import UserServiceAccountForm, ServiceAccountResetForm, UserLookupForm, APIPasswordForm, EmailChangeForm, CreatePrimaryCharacterForm
 
 @login_required
 def profile(request):
@@ -35,6 +35,9 @@ def profile(request):
         profile = SSOUser(user=request.user)
         profile.save()
 
+    if not profile.primary_character:
+        return redirect('sso.views.primarychar_change')
+
     return render_to_response('sso/profile.html', locals(), context_instance=RequestContext(request))
 
 
@@ -271,3 +274,22 @@ def email_change(request):
 
     return render_to_response('sso/emailchange.html', locals(), context_instance=RequestContext(request))
 
+@login_required
+def primarychar_change(request):
+    """ Change the user's primary character """
+
+    clsform = CreatePrimaryCharacterForm(request.user)
+
+    if request.method == 'POST':
+        form = clsform(request.POST)
+        if form.is_valid():
+            profile = request.user.get_profile()
+            profile.primary_character = form.cleaned_data['character']
+            profile.save()
+            messages.add_message(request, messages.INFO, "Your primary character has changed to %s." % form.cleaned_data['character'])
+            return redirect('sso.views.profile') # Redirect after POST
+    else:
+        form = clsform() # An unbound form
+
+    return render_to_response('sso/primarycharchange.html', locals(), context_instance=RequestContext(request))
+