From baf98375f38ca8df6cc482d5cfa94eb288677e61 Mon Sep 17 00:00:00 2001
From: Doug Blank <doug.blank@gmail.com>
Date: Sun, 27 May 2012 14:03:17 +0000
Subject: [PATCH] Type on mediaobject; set probably alive on person edit

svn: r19673
---
 src/webapp/dbdjango.py             | 2 +-
 src/webapp/grampsdb/view/person.py | 2 +-
 src/webapp/shell.py                | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/webapp/dbdjango.py b/src/webapp/dbdjango.py
index 2c41fe649..6e717a469 100644
--- a/src/webapp/dbdjango.py
+++ b/src/webapp/dbdjango.py
@@ -622,7 +622,7 @@ class DbDjango(DbWriteBase, DbReadBase):
             data = cPickle.loads(base64.decodestring(media.cache))
         else:
             data = self.dji.get_media(media)
-        return gen.lib.Media.create(data)
+        return gen.lib.MediaObject.create(data)
 
     def get_place_from_handle(self, handle):
         if handle in self.import_cache:
diff --git a/src/webapp/grampsdb/view/person.py b/src/webapp/grampsdb/view/person.py
index fd65bac63..69d954849 100644
--- a/src/webapp/grampsdb/view/person.py
+++ b/src/webapp/grampsdb/view/person.py
@@ -366,6 +366,7 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
             # check if valid:
             if nf.is_valid() and pf.is_valid() and sf.is_valid():
                 # name.preferred and surname.primary get set False in the above is_valid()
+                person.probably_alive = not bool(person.death)
                 update_last_changed(person, request.user.username)
                 person = pf.save()
                 # Process data:
@@ -385,7 +386,6 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
                 surname.primary = True # FIXME: why is this False?
                 surname.save()
                 dji.rebuild_cache(person)
-                # FIXME: update probably_alive
                 if add_to:
                     item, handle = add_to
                     model = dji.get_model(item)
diff --git a/src/webapp/shell.py b/src/webapp/shell.py
index 1a2749ade..0d3063ee2 100644
--- a/src/webapp/shell.py
+++ b/src/webapp/shell.py
@@ -12,6 +12,7 @@ from webapp.dbdjango import DbDjango
 from webapp.reports import import_file
 from webapp.libdjango import DjangoInterface, totime, todate
 from gen.datehandler import displayer, parser
+import gen.lib
 
 db = DbDjango()
 dji = DjangoInterface()