4 files changed, 20 insertions, 3 deletions
diff --git a/expo/admin.py b/expo/admin.py
index 52138af..d5a7ddd 100644
--- a/expo/admin.py
+++ b/expo/admin.py
@@ -18,8 +18,13 @@ class SurveyAdmin(admin.ModelAdmin):
 class LogbookEntryAdmin(admin.ModelAdmin):
     search_fields = ('title','expedition__year')
 
+class PersonExpeditionInline(admin.TabularInline):
+    model = PersonExpedition
+    extra = 1
+
 class PersonAdmin(admin.ModelAdmin):
     search_fields = ('first_name','last_name')
+    inlines = (PersonExpeditionInline,)
     
 class PersonExpeditionAdmin(admin.ModelAdmin):
     search_fields = ('person__first_name','expedition__year')
diff --git a/expo/forms.py b/expo/forms.py
index c8e2842..91f39f0 100644
--- a/expo/forms.py
+++ b/expo/forms.py
@@ -1,6 +1,10 @@
 from django.forms import ModelForm
-from models import Cave
+from models import Cave, Person
 
 class CaveForm(ModelForm):
     class Meta:
-        model = Cave
-\ No newline at end of file
+        model = Cave
+
+class PersonForm(ModelForm):
+    class Meta:
+        model = Person
+\ No newline at end of file
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
+    
diff --git a/expo/views_logbooks.py b/expo/views_logbooks.py
index 72c44e8..513701b 100644
--- a/expo/views_logbooks.py
+++ b/expo/views_logbooks.py
@@ -4,6 +4,7 @@ import troggle.settings as settings
 
 from troggle.parsers.logbooks import LoadLogbookForExpedition
 from troggle.parsers.people import GetPersonExpeditionNameLookup
+from troggle.expo.forms import PersonForm
 
 import search
 import re
@@ -58,3 +59,8 @@ def logbookSearch(request, extra):
     return render_to_response('logbooksearch.html',
                           { 'query_string': query_string, 'found_entries': found_entries, 'settings': settings})
                           #context_instance=RequestContext(request))
+
+def personForm(request,pk):
+    person=Person.objects.get(pk=pk)
+    form=PersonForm(instance=person)
+    return render_to_response('personform.html', {'form':form,'settings':settings})
+\ No newline at end of file