summaryrefslogtreecommitdiffstats
path: root/expo/models.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:48:10 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:48:10 +0100
commited345f25760d8927f834a69202c2b9b2cef71ee0 (patch)
tree652dba01640060cc2106af850955728828bcd8f0 /expo/models.py
parentcdd4e685ee95e44b9a599b03cf11723a4ce7b7c6 (diff)
downloadtroggle-ed345f25760d8927f834a69202c2b9b2cef71ee0.tar.gz
troggle-ed345f25760d8927f834a69202c2b9b2cef71ee0.tar.bz2
troggle-ed345f25760d8927f834a69202c2b9b2cef71ee0.zip
[svn] Add user registration and user profiles.
Used modified versions of django-registration and django-profiles , both on bitbucket. The Person model is now set up as the profile for auth.User s. I set up a requestcontext so that settings is automatically passed to every template, no need to repeat ourselves in views. However, this needs to be refined: I will soon change it to only pass a subset of settings. E.G. we do not need to be passing the DB login and password! Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8231 by aaron @ 1/29/2009 11:02 PM
Diffstat (limited to 'expo/models.py')
-rw-r--r--expo/models.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/expo/models.py b/expo/models.py
index 2b3919c..98b5d2b 100644
--- a/expo/models.py
+++ b/expo/models.py
@@ -4,6 +4,7 @@ from django.forms import ModelForm
from django.db import models
from django.contrib import admin
from django.core.files.storage import FileSystemStorage
+from django.contrib.auth.models import User
import os
import troggle.settings as settings
import datetime
@@ -59,6 +60,7 @@ class Person(models.Model):
mug_shot = models.CharField(max_length=100, blank=True,null=True)
blurb = models.TextField(blank=True,null=True)
href = models.CharField(max_length=200)
+ user = models.ForeignKey(User, unique=True, null=True, blank=True)
class Meta:
verbose_name_plural = "People"
@@ -482,4 +484,4 @@ class Survey(models.Model):
def elevations(self):
return self.scannedimage_set.filter(contents='elevation')
- \ No newline at end of file
+