From 6b51531cb4b6e080ad06fad588a8f538035d1ff6 Mon Sep 17 00:00:00 2001 From: Danielle McLean Date: Mon, 6 Nov 2017 22:02:12 +1100 Subject: [PATCH] Add a user field specifically for XMPP, because it needs to be handled a little differently to the user profiles (different mf2 property, stuff like that) --- home/templates/home/index.html | 5 +++++ users/admin.py | 2 +- users/migrations/0009_user_xmpp.py | 20 ++++++++++++++++++++ users/models.py | 2 ++ 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 users/migrations/0009_user_xmpp.py diff --git a/home/templates/home/index.html b/home/templates/home/index.html index aa71fcc..4a39059 100644 --- a/home/templates/home/index.html +++ b/home/templates/home/index.html @@ -30,6 +30,11 @@
  • {{ user.email }}
  • + {% if user.xmpp %} +
  • + {{ user.xmpp }} +
  • + {% endif %} {% for profile in user.profiles.all %}
  • {{ profile.name }}
  • {% endfor %} diff --git a/users/admin.py b/users/admin.py index 7efd9c8..c5f11c4 100644 --- a/users/admin.py +++ b/users/admin.py @@ -19,7 +19,7 @@ class ProfileInline(admin.TabularInline): class UserAdmin(BaseUserAdmin): fieldsets = BaseUserAdmin.fieldsets + ( - ('Profile', {'fields': ('avatar', 'note')}), + ('Profile', {'fields': ('avatar', 'xmpp', 'note')}), ) inlines = ( KeyInline, diff --git a/users/migrations/0009_user_xmpp.py b/users/migrations/0009_user_xmpp.py new file mode 100644 index 0000000..b554f08 --- /dev/null +++ b/users/migrations/0009_user_xmpp.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.7 on 2017-11-06 10:59 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0008_auto_20171031_1357'), + ] + + operations = [ + migrations.AddField( + model_name='user', + name='xmpp', + field=models.EmailField(blank=True, max_length=254), + ), + ] diff --git a/users/models.py b/users/models.py index dca161d..7e2d876 100644 --- a/users/models.py +++ b/users/models.py @@ -33,6 +33,8 @@ class Site(models.Model): class User(ModelMeta, AbstractUser): avatar = models.ImageField(upload_to=avatar_path) note = models.TextField(blank=True) + xmpp = models.EmailField(blank=True) + # This is gonna need to change if I ever decide to add multiple-user support ;) url = '/'