From 1d109195b8cd42f802054ab5580b56f4262cefb8 Mon Sep 17 00:00:00 2001
From: Doug Blank <doug.blank@gmail.com>
Date: Tue, 13 Dec 2011 02:08:47 +0000
Subject: [PATCH] Person view details and edit sorta working

svn: r18589
---
 src/data/templates/view_citation_detail.html   | 1 -
 src/data/templates/view_event_detail.html      | 1 -
 src/data/templates/view_family_detail.html     | 1 -
 src/data/templates/view_media_detail.html      | 1 -
 src/data/templates/view_name_detail.html       | 1 -
 src/data/templates/view_note_detail.html       | 1 -
 src/data/templates/view_person_detail.html     | 1 -
 src/data/templates/view_place_detail.html      | 1 -
 src/data/templates/view_repository_detail.html | 1 -
 src/data/templates/view_source_detail.html     | 1 -
 src/data/templates/view_tag_detail.html        | 1 -
 src/webapp/grampsdb/views.py                   | 6 +++++-
 src/webapp/utils.py                            | 6 +++++-
 13 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/data/templates/view_citation_detail.html b/src/data/templates/view_citation_detail.html
index 4b6f13094..4a030aa64 100644
--- a/src/data/templates/view_citation_detail.html
+++ b/src/data/templates/view_citation_detail.html
@@ -45,7 +45,6 @@
 </div>
 
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/data/templates/view_event_detail.html b/src/data/templates/view_event_detail.html
index 86638dd5d..545a6631b 100644
--- a/src/data/templates/view_event_detail.html
+++ b/src/data/templates/view_event_detail.html
@@ -43,7 +43,6 @@
 </div>
 </div>
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/data/templates/view_family_detail.html b/src/data/templates/view_family_detail.html
index 0dd3575fa..18068fd13 100644
--- a/src/data/templates/view_family_detail.html
+++ b/src/data/templates/view_family_detail.html
@@ -75,7 +75,6 @@
 </div>
 
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/data/templates/view_media_detail.html b/src/data/templates/view_media_detail.html
index a7e6462b1..6307f761d 100644
--- a/src/data/templates/view_media_detail.html
+++ b/src/data/templates/view_media_detail.html
@@ -28,7 +28,6 @@
 </table>
 
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/data/templates/view_name_detail.html b/src/data/templates/view_name_detail.html
index 1bccbb065..2c7aba561 100644
--- a/src/data/templates/view_name_detail.html
+++ b/src/data/templates/view_name_detail.html
@@ -67,7 +67,6 @@
 </div>
 
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/data/templates/view_note_detail.html b/src/data/templates/view_note_detail.html
index 163d87600..b04108d3d 100644
--- a/src/data/templates/view_note_detail.html
+++ b/src/data/templates/view_note_detail.html
@@ -33,7 +33,6 @@
 </table>
 
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/data/templates/view_person_detail.html b/src/data/templates/view_person_detail.html
index fa0c56cd1..904c4e036 100644
--- a/src/data/templates/view_person_detail.html
+++ b/src/data/templates/view_person_detail.html
@@ -72,7 +72,6 @@
 </div>
 </div>
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/data/templates/view_place_detail.html b/src/data/templates/view_place_detail.html
index 671ad80bd..bcb27b537 100644
--- a/src/data/templates/view_place_detail.html
+++ b/src/data/templates/view_place_detail.html
@@ -36,7 +36,6 @@
 </table>
 
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/data/templates/view_repository_detail.html b/src/data/templates/view_repository_detail.html
index 68e17bc63..2464dc09b 100644
--- a/src/data/templates/view_repository_detail.html
+++ b/src/data/templates/view_repository_detail.html
@@ -32,7 +32,6 @@
 </table>
 
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/data/templates/view_source_detail.html b/src/data/templates/view_source_detail.html
index 4b6f13094..4a030aa64 100644
--- a/src/data/templates/view_source_detail.html
+++ b/src/data/templates/view_source_detail.html
@@ -45,7 +45,6 @@
 </div>
 
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/data/templates/view_tag_detail.html b/src/data/templates/view_tag_detail.html
index 3a9ff76fd..ef4a64440 100644
--- a/src/data/templates/view_tag_detail.html
+++ b/src/data/templates/view_tag_detail.html
@@ -34,7 +34,6 @@
 </table>
 
 <!-- Tabs -->
-<h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
diff --git a/src/webapp/grampsdb/views.py b/src/webapp/grampsdb/views.py
index 53d0a652c..e2ce70e26 100644
--- a/src/webapp/grampsdb/views.py
+++ b/src/webapp/grampsdb/views.py
@@ -466,7 +466,7 @@ def view_person_detail(request, view, handle, action="view"):
             except:
                 name = Name(person=person, preferred=True)
             primary_surname = name.surname_set.get(primary=True)
-            default_data = {"surname": "XX" or primary_surname.surname, 
+            default_data = {"surname": primary_surname.surname, 
                             "prefix": primary_surname.prefix or "prefix",
                             "suffix": name.suffix or "suffix",
                             "first_name": name.first_name,
@@ -519,7 +519,11 @@ def view_person_detail(request, view, handle, action="view"):
                 return fix_person(request, person)
             pf = PersonForm(instance=person)
             pf.model = person
+            primary = name.surname_set.get(primary=True)
             nf = NameForm(instance=name)
+            nf.prefix=primary.prefix
+            nf.surname=primary.surname
+            nf.origin=primary.name_origin_type
             nf.model = name
     else: # view person detail
         # BEGIN NON-AUTHENTICATED ACCESS
diff --git a/src/webapp/utils.py b/src/webapp/utils.py
index 497cc190c..bff7ffc39 100644
--- a/src/webapp/utils.py
+++ b/src/webapp/utils.py
@@ -582,7 +582,11 @@ def render(formfield, user, action, test=False, truetext=""):
             try:
                 retval = str(getattr(formfield.form.model, fieldname))
             except:
-                retval = "???" # formfield._data()
+                # name, "prefix"
+                try:
+                    retval = str(getattr(formfield.form, fieldname)) # formfield._data()
+                except:
+                    retval = "XXX"
         else:
             retval = truetext
     else: