Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed variables action -> act to avoid conflict with function

Browse Source 
svn: r20039
This commit is contained in:
Doug Blank
2012-07-21 15:02:52 +00:00
parent 9295c61005
commit d944dc918f
11 changed files with 243 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/webapp/grampsdb/view/citation.py
View File

@@ -34,9 +34,9 @@ from django.template import Context, RequestContext
## Globals ## Globals
dji = DjangoInterface() dji = DjangoInterface()
def process_citation(request, context, handle, action, add_to=None): # view, edit, save def process_citation(request, context, handle, act, add_to=None): # view, edit, save
""" """
Process action on person. Can return a redirect. Process act on person. Can return a redirect.
""" """
context["tview"] = _("Citation") context["tview"] = _("Citation")
context["tviews"] = _("Citations") context["tviews"] = _("Citations")
@@ -44,12 +44,12 @@ def process_citation(request, context, handle, action, add_to=None): # view, edi
view_template = "view_citation_detail.html" view_template = "view_citation_detail.html"
if handle == "add": if handle == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
# Handle: edit, view, add, create, save, delete, share, save-share # Handle: edit, view, add, create, save, delete, share, save-share
if action == "share": if act == "share":
item, handle = add_to item, handle = add_to
context["pickform"] = PickForm("Pick citation", context["pickform"] = PickForm("Pick citation",
Citation, Citation,
@@ -58,7 +58,7 @@ def process_citation(request, context, handle, action, add_to=None): # view, edi
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "save-share": elif act == "save-share":
item, handle = add_to item, handle = add_to
pickform = PickForm("Pick citation", pickform = PickForm("Pick citation",
Citation, Citation,
@@ -77,21 +77,21 @@ def process_citation(request, context, handle, action, add_to=None): # view, edi
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "add": elif act == "add":
source = Source(gramps_id=dji.get_next_id(Source, "S")) source = Source(gramps_id=dji.get_next_id(Source, "S"))
sourceform = SourceForm(instance=source) sourceform = SourceForm(instance=source)
sourceform.model = source sourceform.model = source
citation = Citation(source=source, gramps_id=dji.get_next_id(Citation, "C")) citation = Citation(source=source, gramps_id=dji.get_next_id(Citation, "C"))
citationform = CitationForm(instance=citation) citationform = CitationForm(instance=citation)
citationform.model = citation citationform.model = citation
elif action in ["view", "edit"]: elif act in ["view", "edit"]:
citation = Citation.objects.get(handle=handle) citation = Citation.objects.get(handle=handle)
citationform = CitationForm(instance=citation) citationform = CitationForm(instance=citation)
citationform.model = citation citationform.model = citation
source = citation.source source = citation.source
sourceform = SourceForm(instance=source) sourceform = SourceForm(instance=source)
sourceform.model = source sourceform.model = source
elif action == "save": elif act == "save":
citation = Citation.objects.get(handle=handle) citation = Citation.objects.get(handle=handle)
citationform = CitationForm(request.POST, instance=citation) citationform = CitationForm(request.POST, instance=citation)
citationform.model = citation citationform.model = citation
@@ -99,10 +99,10 @@ def process_citation(request, context, handle, action, add_to=None): # view, edi
update_last_changed(citation, request.user.username) update_last_changed(citation, request.user.username)
citation = citationform.save() citation = citationform.save()
dji.rebuild_cache(citation) dji.rebuild_cache(citation)
action = "view" act = "view"
else: else:
action = "edit" act = "edit"
elif action == "create": elif act == "create":
source = Source(handle=create_id()) source = Source(handle=create_id())
sourceform = SourceForm(request.POST, instance=source) sourceform = SourceForm(request.POST, instance=source)
sourceform.model = source sourceform.model = source
@@ -124,21 +124,21 @@ def process_citation(request, context, handle, action, add_to=None): # view, edi
dji.add_citation_ref(obj, citation.handle) dji.add_citation_ref(obj, citation.handle)
dji.rebuild_cache(obj) dji.rebuild_cache(obj)
return redirect("/%s/%s#tab-citations" % (item, handle)) return redirect("/%s/%s#tab-citations" % (item, handle))
action = "view" act = "view"
else: else:
action = "add" act = "add"
elif action == "delete": elif act == "delete":
citation = Citation.objects.get(handle=handle) citation = Citation.objects.get(handle=handle)
citation.delete() citation.delete()
return redirect("/citation/") return redirect("/citation/")
else: else:
raise Exception("Unhandled action: '%s'" % action) raise Exception("Unhandled act: '%s'" % act)
context["citationform"] = citationform context["citationform"] = citationform
context["sourceform"] = sourceform context["sourceform"] = sourceform
context["object"] = citation context["object"] = citation
context["citation"] = citation context["citation"] = citation
context["source"] = source context["source"] = source
context["action"] = action context["action"] = act
return render_to_response(view_template, context) return render_to_response(view_template, context)

34
src/webapp/grampsdb/view/event.py
View File

@@ -39,9 +39,9 @@ db = DbDjango()
dd = displayer.display dd = displayer.display
dp = parser.parse dp = parser.parse
def process_event(request, context, handle, action, add_to=None): # view, edit, save def process_event(request, context, handle, act, add_to=None): # view, edit, save
""" """
Process action on person. Can return a redirect. Process act on person. Can return a redirect.
""" """
context["tview"] = _("Event") context["tview"] = _("Event")
context["tviews"] = _("Events") context["tviews"] = _("Events")
@@ -49,12 +49,12 @@ def process_event(request, context, handle, action, add_to=None): # view, edit,
view_template = "view_event_detail.html" view_template = "view_event_detail.html"
if handle == "add": if handle == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
# Handle: edit, view, add, create, save, delete, share, save-share # Handle: edit, view, add, create, save, delete, share, save-share
if action == "share": if act == "share":
item, handle = add_to item, handle = add_to
context["pickform"] = PickForm("Pick event", context["pickform"] = PickForm("Pick event",
Event, Event,
@@ -63,7 +63,7 @@ def process_event(request, context, handle, action, add_to=None): # view, edit,
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "save-share": elif act == "save-share":
item, handle = add_to item, handle = add_to
pickform = PickForm("Pick event", pickform = PickForm("Pick event",
Event, Event,
@@ -82,11 +82,11 @@ def process_event(request, context, handle, action, add_to=None): # view, edit,
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "add": elif act == "add":
event = Event(gramps_id=dji.get_next_id(Event, "E")) event = Event(gramps_id=dji.get_next_id(Event, "E"))
eventform = EventForm(instance=event) eventform = EventForm(instance=event)
eventform.model = event eventform.model = event
elif action in ["view", "edit"]: elif act in ["view", "edit"]:
event = Event.objects.get(handle=handle) event = Event.objects.get(handle=handle)
genlibevent = db.get_event_from_handle(handle) genlibevent = db.get_event_from_handle(handle)
if genlibevent: if genlibevent:
@@ -94,7 +94,7 @@ def process_event(request, context, handle, action, add_to=None): # view, edit,
event.text = dd(date) event.text = dd(date)
eventform = EventForm(instance=event) eventform = EventForm(instance=event)
eventform.model = event eventform.model = event
elif action == "save": elif act == "save":
event = Event.objects.get(handle=handle) event = Event.objects.get(handle=handle)
eventform = EventForm(request.POST, instance=event) eventform = EventForm(request.POST, instance=event)
eventform.model = event eventform.model = event
@@ -102,10 +102,10 @@ def process_event(request, context, handle, action, add_to=None): # view, edit,
update_last_changed(event, request.user.username) update_last_changed(event, request.user.username)
event = eventform.save() event = eventform.save()
dji.rebuild_cache(event) dji.rebuild_cache(event)
action = "view" act = "view"
else: else:
action = "edit" act = "edit"
elif action == "create": elif act == "create":
event = Event(handle=create_id()) event = Event(handle=create_id())
eventform = EventForm(request.POST, instance=event) eventform = EventForm(request.POST, instance=event)
eventform.model = event eventform.model = event
@@ -120,19 +120,19 @@ def process_event(request, context, handle, action, add_to=None): # view, edit,
dji.add_event_ref_default(obj, event) dji.add_event_ref_default(obj, event)
dji.rebuild_cache(obj) dji.rebuild_cache(obj)
return redirect("/%s/%s#tab-events" % (item, handle)) return redirect("/%s/%s#tab-events" % (item, handle))
action = "view" act = "view"
else: else:
action = "add" act = "add"
elif action == "delete": elif act == "delete":
event = Event.objects.get(handle=handle) event = Event.objects.get(handle=handle)
event.delete() event.delete()
return redirect("/event/") return redirect("/event/")
else: else:
raise Exception("Unhandled action: '%s'" % action) raise Exception("Unhandled act: '%s'" % act)
context["eventform"] = eventform context["eventform"] = eventform
context["object"] = event context["object"] = event
context["event"] = event context["event"] = event
context["action"] = action context["action"] = act
return render_to_response(view_template, context) return render_to_response(view_template, context)

30
src/webapp/grampsdb/view/family.py
View File

@@ -35,31 +35,31 @@ from django.template import Context, RequestContext
## Globals ## Globals
dji = DjangoInterface() dji = DjangoInterface()
def process_family(request, context, handle, action, add_to=None): # view, edit, save def process_family(request, context, handle, act, add_to=None): # view, edit, save
""" """
Process action on person. Can return a redirect. Process act on person. Can return a redirect.
""" """
context["tview"] = _("Family") context["tview"] = _("Family")
context["tviews"] = _("Familes") context["tviews"] = _("Familes")
if handle == "add": if handle == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
# Handle: edit, view, add, create, save, delete # Handle: edit, view, add, create, save, delete
if action == "add": if act == "add":
family = Family( family = Family(
gramps_id=dji.get_next_id(Family, "F"), gramps_id=dji.get_next_id(Family, "F"),
family_rel_type=FamilyRelType.objects.get( family_rel_type=FamilyRelType.objects.get(
val=FamilyRelType._DEFAULT[0])) val=FamilyRelType._DEFAULT[0]))
familyform = FamilyForm(instance=family) familyform = FamilyForm(instance=family)
familyform.model = family familyform.model = family
elif action in ["view", "edit"]: elif act in ["view", "edit"]:
family = Family.objects.get(handle=handle) family = Family.objects.get(handle=handle)
familyform = FamilyForm(instance=family) familyform = FamilyForm(instance=family)
familyform.model = family familyform.model = family
elif action == "save": elif act == "save":
family = Family.objects.get(handle=handle) family = Family.objects.get(handle=handle)
familyform = FamilyForm(request.POST, instance=family) familyform = FamilyForm(request.POST, instance=family)
familyform.model = family familyform.model = family
@@ -75,10 +75,10 @@ def process_family(request, context, handle, action, add_to=None): # view, edit,
if family not in family.father.families.all(): if family not in family.father.families.all():
family.father.families.add(family) family.father.families.add(family)
dji.rebuild_cache(family) dji.rebuild_cache(family)
action = "view" act = "view"
else: else:
action = "edit" act = "edit"
elif action == "create": elif act == "create":
family = Family(family_rel_type=FamilyRelType.objects.get( family = Family(family_rel_type=FamilyRelType.objects.get(
val=FamilyRelType._DEFAULT[0]), val=FamilyRelType._DEFAULT[0]),
handle=create_id()) handle=create_id())
@@ -103,20 +103,20 @@ def process_family(request, context, handle, action, add_to=None): # view, edit,
dji.add_family_ref(obj, family.handle) dji.add_family_ref(obj, family.handle)
dji.rebuild_cache(obj) dji.rebuild_cache(obj)
return redirect("/%s/%s" % (item, handle)) return redirect("/%s/%s" % (item, handle))
action = "view" act = "view"
else: else:
action = "add" act = "add"
elif action == "delete": elif act == "delete":
family = Family.objects.get(handle=handle) family = Family.objects.get(handle=handle)
family.delete() family.delete()
return redirect("/family/") return redirect("/family/")
else: else:
raise Exception("Unhandled action: '%s'" % action) raise Exception("Unhandled act: '%s'" % act)
context["familyform"] = familyform context["familyform"] = familyform
context["object"] = family context["object"] = family
context["family"] = family context["family"] = family
context["action"] = action context["action"] = act
view_template = "view_family_detail.html" view_template = "view_family_detail.html"
return render_to_response(view_template, context) return render_to_response(view_template, context)

38
src/webapp/grampsdb/view/media.py
View File

@@ -47,9 +47,9 @@ def pb2image(pb):
width, height = pb.get_width(), pb.get_height() width, height = pb.get_width(), pb.get_height()
return Image.fromstring("RGB", (width,height), pb.get_pixels()) return Image.fromstring("RGB", (width,height), pb.get_pixels())
def process_media(request, context, handle, action, add_to=None): # view, edit, save def process_media(request, context, handle, act, add_to=None): # view, edit, save
""" """
Process action on person. Can return a redirect. Process act on person. Can return a redirect.
""" """
context["tview"] = _("Media") context["tview"] = _("Media")
context["tviews"] = _("Media") context["tviews"] = _("Media")
@@ -57,12 +57,12 @@ def process_media(request, context, handle, action, add_to=None): # view, edit,
view_template = "view_media_detail.html" view_template = "view_media_detail.html"
if handle == "add": if handle == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
# Handle: edit, view, add, create, save, delete, share, save-share # Handle: edit, view, add, create, save, delete, share, save-share
if action == "share": if act == "share":
item, handle = add_to item, handle = add_to
context["pickform"] = PickForm("Pick media", context["pickform"] = PickForm("Pick media",
Media, Media,
@@ -71,7 +71,7 @@ def process_media(request, context, handle, action, add_to=None): # view, edit,
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "save-share": elif act == "save-share":
item, handle = add_to item, handle = add_to
pickform = PickForm("Pick media", pickform = PickForm("Pick media",
Media, Media,
@@ -90,7 +90,7 @@ def process_media(request, context, handle, action, add_to=None): # view, edit,
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "full": elif act == "full":
media = Media.objects.get(handle=handle) media = Media.objects.get(handle=handle)
media_type, media_ext = media.mime.split("/", 1) media_type, media_ext = media.mime.split("/", 1)
# FIXME: This should be absolute: # FIXME: This should be absolute:
@@ -107,7 +107,7 @@ def process_media(request, context, handle, action, add_to=None): # view, edit,
image = png.Image(pixels, meta) image = png.Image(pixels, meta)
image.save(response) image.save(response)
return response return response
elif action == "thumbnail": elif act == "thumbnail":
media = Media.objects.get(handle=handle) media = Media.objects.get(handle=handle)
media_type, media_ext = media.mime.split("/", 1) media_type, media_ext = media.mime.split("/", 1)
# FIXME: This should be absolute: # FIXME: This should be absolute:
@@ -147,15 +147,15 @@ def process_media(request, context, handle, action, add_to=None): # view, edit,
image.save("%s/thumbnail/%s" % (folder, media.path), media_ext) image.save("%s/thumbnail/%s" % (folder, media.path), media_ext)
image.save(response, media_ext.upper()) image.save(response, media_ext.upper())
return response return response
elif action == "add": elif act == "add":
media = Media(gramps_id=dji.get_next_id(Media, "M")) media = Media(gramps_id=dji.get_next_id(Media, "M"))
mediaform = MediaForm(instance=media) mediaform = MediaForm(instance=media)
mediaform.model = media mediaform.model = media
elif action in ["view", "edit"]: elif act in ["view", "edit"]:
media = Media.objects.get(handle=handle) media = Media.objects.get(handle=handle)
mediaform = MediaForm(instance=media) mediaform = MediaForm(instance=media)
mediaform.model = media mediaform.model = media
elif action == "save": elif act == "save":
media = Media.objects.get(handle=handle) media = Media.objects.get(handle=handle)
mediaform = MediaForm(request.POST, instance=media) mediaform = MediaForm(request.POST, instance=media)
mediaform.model = media mediaform.model = media
@@ -163,10 +163,10 @@ def process_media(request, context, handle, action, add_to=None): # view, edit,
update_last_changed(media, request.user.username) update_last_changed(media, request.user.username)
media = mediaform.save() media = mediaform.save()
dji.rebuild_cache(media) dji.rebuild_cache(media)
action = "view" act = "view"
else: else:
action = "edit" act = "edit"
elif action == "create": elif act == "create":
media = Media(handle=create_id()) media = Media(handle=create_id())
mediaform = MediaForm(request.POST, instance=media) mediaform = MediaForm(request.POST, instance=media)
mediaform.model = media mediaform.model = media
@@ -182,19 +182,19 @@ def process_media(request, context, handle, action, add_to=None): # view, edit,
return redirect("/%s/%s#tab-gallery" % (item, handle)) return redirect("/%s/%s#tab-gallery" % (item, handle))
else: else:
dji.rebuild_cache(media) dji.rebuild_cache(media)
action = "view" act = "view"
else: else:
action = "add" act = "add"
elif action == "delete": elif act == "delete":
media = Media.objects.get(handle=handle) media = Media.objects.get(handle=handle)
media.delete() media.delete()
return redirect("/media/") return redirect("/media/")
else: else:
raise Exception("Unhandled action: '%s'" % action) raise Exception("Unhandled act: '%s'" % act)
context["mediaform"] = mediaform context["mediaform"] = mediaform
context["object"] = media context["object"] = media
context["media"] = media context["media"] = media
context["action"] = action context["action"] = act
return render_to_response(view_template, context) return render_to_response(view_template, context)

34
src/webapp/grampsdb/view/note.py
View File

@@ -37,9 +37,9 @@ dji = DjangoInterface()
db = DbDjango() db = DbDjango()
snf = StyledNoteFormatter(db) snf = StyledNoteFormatter(db)
def process_note(request, context, handle, action, add_to=None): # view, edit, save def process_note(request, context, handle, act, add_to=None): # view, edit, save
""" """
Process action on person. Can return a redirect. Process act on person. Can return a redirect.
""" """
context["tview"] = _("Note") context["tview"] = _("Note")
context["tviews"] = _("Notes") context["tviews"] = _("Notes")
@@ -47,12 +47,12 @@ def process_note(request, context, handle, action, add_to=None): # view, edit, s
view_template = "view_note_detail.html" view_template = "view_note_detail.html"
if handle == "add": if handle == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
# Handle: edit, view, add, create, save, delete, share, save-share # Handle: edit, view, add, create, save, delete, share, save-share
if action == "share": if act == "share":
item, handle = add_to item, handle = add_to
context["pickform"] = PickForm("Pick note", context["pickform"] = PickForm("Pick note",
Note, Note,
@@ -61,7 +61,7 @@ def process_note(request, context, handle, action, add_to=None): # view, edit, s
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "save-share": elif act == "save-share":
item, handle = add_to item, handle = add_to
pickform = PickForm("Pick note", pickform = PickForm("Pick note",
Note, Note,
@@ -80,18 +80,18 @@ def process_note(request, context, handle, action, add_to=None): # view, edit, s
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "add": elif act == "add":
note = Note(gramps_id=dji.get_next_id(Note, "N")) note = Note(gramps_id=dji.get_next_id(Note, "N"))
notetext = "" notetext = ""
noteform = NoteForm(instance=note, initial={"notetext": notetext}) noteform = NoteForm(instance=note, initial={"notetext": notetext})
noteform.model = note noteform.model = note
elif action in ["view", "edit"]: elif act in ["view", "edit"]:
note = Note.objects.get(handle=handle) note = Note.objects.get(handle=handle)
genlibnote = db.get_note_from_handle(note.handle) genlibnote = db.get_note_from_handle(note.handle)
notetext = snf.format(genlibnote) notetext = snf.format(genlibnote)
noteform = NoteForm(instance=note, initial={"notetext": notetext}) noteform = NoteForm(instance=note, initial={"notetext": notetext})
noteform.model = note noteform.model = note
elif action == "save": elif act == "save":
note = Note.objects.get(handle=handle) note = Note.objects.get(handle=handle)
notetext = "" notetext = ""
noteform = NoteForm(request.POST, instance=note, initial={"notetext": notetext}) noteform = NoteForm(request.POST, instance=note, initial={"notetext": notetext})
@@ -104,11 +104,11 @@ def process_note(request, context, handle, action, add_to=None): # view, edit, s
dji.save_note_markup(note, notedata[1]) dji.save_note_markup(note, notedata[1])
dji.rebuild_cache(note) dji.rebuild_cache(note)
notetext = noteform.data["notetext"] notetext = noteform.data["notetext"]
action = "view" act = "view"
else: else:
notetext = noteform.data["notetext"] notetext = noteform.data["notetext"]
action = "edit" act = "edit"
elif action == "create": elif act == "create":
note = Note(handle=create_id()) note = Note(handle=create_id())
notetext = "" notetext = ""
noteform = NoteForm(request.POST, instance=note, initial={"notetext": notetext}) noteform = NoteForm(request.POST, instance=note, initial={"notetext": notetext})
@@ -128,22 +128,22 @@ def process_note(request, context, handle, action, add_to=None): # view, edit, s
dji.rebuild_cache(obj) dji.rebuild_cache(obj)
return redirect("/%s/%s#tab-notes" % (item, handle)) return redirect("/%s/%s#tab-notes" % (item, handle))
notetext = noteform.data["notetext"] notetext = noteform.data["notetext"]
action = "view" act = "view"
else: else:
notetext = noteform.data["notetext"] notetext = noteform.data["notetext"]
action = "add" act = "add"
elif action == "delete": elif act == "delete":
# FIXME: delete markup too for this note # FIXME: delete markup too for this note
note = Note.objects.get(handle=handle) note = Note.objects.get(handle=handle)
note.delete() note.delete()
return redirect("/note/") return redirect("/note/")
else: else:
raise Exception("Unhandled action: '%s'" % action) raise Exception("Unhandled act: '%s'" % act)
context["noteform"] = noteform context["noteform"] = noteform
context["object"] = note context["object"] = note
context["notetext"] = notetext context["notetext"] = notetext
context["note"] = note context["note"] = note
context["action"] = action context["action"] = act
return render_to_response(view_template, context) return render_to_response(view_template, context)

78
src/webapp/grampsdb/view/person.py
View File

@@ -113,25 +113,25 @@ def check_preferred(request, name, person):
if not ok: if not ok:
name.preferred = True name.preferred = True
def process_surname(request, handle, order, sorder, action="view"): def process_surname(request, handle, order, sorder, act="view"):
#import pdb; pdb.set_trace() #import pdb; pdb.set_trace()
# /sdjhgsdjhdhgsd/name/1/surname/1 (view) # /sdjhgsdjhdhgsd/name/1/surname/1 (view)
# /sdjhgsdjhdhgsd/name/1/surname/add # /sdjhgsdjhdhgsd/name/1/surname/add
# /sdjhgsdjhdhgsd/name/1/surname/2/[edit|view|add|delete] # /sdjhgsdjhdhgsd/name/1/surname/2/[edit|view|add|delete]
if sorder == "add": if sorder == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
person = Person.objects.get(handle=handle) person = Person.objects.get(handle=handle)
name = person.name_set.get(order=order) name = person.name_set.get(order=order)
if action in ["view", "edit"]: if act in ["view", "edit"]:
surname = name.surname_set.get(order=sorder) surname = name.surname_set.get(order=sorder)
if action == "edit": if act == "edit":
surname.prefix = make_empty(True, surname.prefix, " prefix ") surname.prefix = make_empty(True, surname.prefix, " prefix ")
elif action in ["delete"]: elif act in ["delete"]:
surnames = name.surname_set.all().order_by("order") surnames = name.surname_set.all().order_by("order")
if len(surnames) > 1: if len(surnames) > 1:
neworder = 1 neworder = 1
@@ -148,11 +148,11 @@ def process_surname(request, handle, order, sorder, action="view"):
request.user.message_set.create(message="You can't delete the only surname") request.user.message_set.create(message="You can't delete the only surname")
return redirect("/person/%s/name/%s%s#tab-surnames" % (person.handle, name.order, return redirect("/person/%s/name/%s%s#tab-surnames" % (person.handle, name.order,
build_search(request))) build_search(request)))
elif action in ["add"]: elif act in ["add"]:
surname = Surname(name=name, primary=False, surname = Surname(name=name, primary=False,
name_origin_type=NameOriginType.objects.get(val=NameOriginType._DEFAULT[0])) name_origin_type=NameOriginType.objects.get(val=NameOriginType._DEFAULT[0]))
surname.prefix = make_empty(True, surname.prefix, " prefix ") surname.prefix = make_empty(True, surname.prefix, " prefix ")
elif action == "create": elif act == "create":
surnames = name.surname_set.all().order_by("order") surnames = name.surname_set.all().order_by("order")
sorder = 1 sorder = 1
for surname in surnames: for surname in surnames:
@@ -171,9 +171,9 @@ def process_surname(request, handle, order, sorder, action="view"):
return redirect("/person/%s/name/%s/surname/%s%s#tab-surnames" % return redirect("/person/%s/name/%s/surname/%s%s#tab-surnames" %
(person.handle, name.order, sorder, (person.handle, name.order, sorder,
build_search(request))) build_search(request)))
action = "add" act = "add"
surname.prefix = make_empty(True, surname.prefix, " prefix ") surname.prefix = make_empty(True, surname.prefix, " prefix ")
elif action == "save": elif act == "save":
surname = name.surname_set.get(order=sorder) surname = name.surname_set.get(order=sorder)
sf = SurnameForm(request.POST, instance=surname) sf = SurnameForm(request.POST, instance=surname)
sf.model = surname sf.model = surname
@@ -186,17 +186,17 @@ def process_surname(request, handle, order, sorder, action="view"):
return redirect("/person/%s/name/%s/surname/%s%s#tab-surnames" % return redirect("/person/%s/name/%s/surname/%s%s#tab-surnames" %
(person.handle, name.order, sorder, (person.handle, name.order, sorder,
build_search(request))) build_search(request)))
action = "edit" act = "edit"
surname.prefix = make_empty(True, surname.prefix, " prefix ") surname.prefix = make_empty(True, surname.prefix, " prefix ")
# else, edit again # else, edit again
else: else:
raise Exception("unknown action: '%s'" % action) raise Exception("unknown act: '%s'" % act)
sf = SurnameForm(instance=surname) sf = SurnameForm(instance=surname)
sf.model = surname sf.model = surname
context = RequestContext(request) context = RequestContext(request)
context["action"] = action context["action"] = act
context["tview"] = _("Surname") context["tview"] = _("Surname")
context["handle"] = handle context["handle"] = handle
context["id"] = id context["id"] = id
@@ -208,19 +208,19 @@ def process_surname(request, handle, order, sorder, action="view"):
view_template = 'view_surname_detail.html' view_template = 'view_surname_detail.html'
return render_to_response(view_template, context) return render_to_response(view_template, context)
def process_name(request, handle, order, action="view"): def process_name(request, handle, order, act="view"):
if order == "add": if order == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
### Process action: ### Process act:
if action in "view": if act in "view":
pf, nf, sf, person = get_person_forms(handle, order=order) pf, nf, sf, person = get_person_forms(handle, order=order)
name = nf.model name = nf.model
elif action == "edit": elif act == "edit":
pf, nf, sf, person = get_person_forms(handle, order=order) pf, nf, sf, person = get_person_forms(handle, order=order)
name = nf.model name = nf.model
elif action == "delete": elif act == "delete":
person = Person.objects.get(handle=handle) person = Person.objects.get(handle=handle)
name = person.name_set.filter(order=order) name = person.name_set.filter(order=order)
names = person.name_set.all() names = person.name_set.all()
@@ -231,7 +231,7 @@ def process_name(request, handle, order, action="view"):
request.user.message_set.create(message = "Can't delete only name.") request.user.message_set.create(message = "Can't delete only name.")
return redirect("/person/%s%s#tab-names" % (person.handle, return redirect("/person/%s%s#tab-names" % (person.handle,
build_search(request))) build_search(request)))
elif action == "add": # add name elif act == "add": # add name
person = Person.objects.get(handle=handle) person = Person.objects.get(handle=handle)
name = Name(person=person, name = Name(person=person,
preferred=False, preferred=False,
@@ -246,7 +246,7 @@ def process_name(request, handle, order, action="view"):
name_origin_type=NameOriginType.objects.get(val=NameOriginType._DEFAULT[0])) name_origin_type=NameOriginType.objects.get(val=NameOriginType._DEFAULT[0]))
sf = SurnameForm(request.POST, instance=surname) sf = SurnameForm(request.POST, instance=surname)
sf.model = surname sf.model = surname
elif action == "create": elif act == "create":
# make new data # make new data
person = Person.objects.get(handle=handle) person = Person.objects.get(handle=handle)
name = Name(preferred=False) name = Name(preferred=False)
@@ -285,8 +285,8 @@ def process_name(request, handle, order, action="view"):
return redirect("/person/%s/name/%s%s#tab-surnames" % (person.handle, name.order, return redirect("/person/%s/name/%s%s#tab-surnames" % (person.handle, name.order,
build_search(request))) build_search(request)))
else: else:
action = "add" act = "add"
elif action == "save": elif act == "save":
# look up old data: # look up old data:
person = Person.objects.get(handle=handle) person = Person.objects.get(handle=handle)
oldname = person.name_set.get(order=order) oldname = person.name_set.get(order=order)
@@ -321,9 +321,9 @@ def process_name(request, handle, order, action="view"):
return redirect("/person/%s/name/%s%s#tab-surnames" % (person.handle, name.order, return redirect("/person/%s/name/%s%s#tab-surnames" % (person.handle, name.order,
build_search(request))) build_search(request)))
else: else:
action = "edit" act = "edit"
context = RequestContext(request) context = RequestContext(request)
context["action"] = action context["action"] = act
context["tview"] = _('Name') context["tview"] = _('Name')
context["tviews"] = _('Names') context["tviews"] = _('Names')
context["view"] = 'name' context["view"] = 'name'
@@ -338,15 +338,15 @@ def process_name(request, handle, order, action="view"):
view_template = "view_name_detail.html" view_template = "view_name_detail.html"
return render_to_response(view_template, context) return render_to_response(view_template, context)
def process_person(request, context, handle, action, add_to=None): # view, edit, save def process_person(request, context, handle, act, add_to=None): # view, edit, save
""" """
Process action on person. Can return a redirect. Process act on person. Can return a redirect.
""" """
context["tview"] = _("Person") context["tview"] = _("Person")
context["tviews"] = _("People") context["tviews"] = _("People")
logform = None logform = None
if request.user.is_authenticated(): if request.user.is_authenticated():
if action == "share": if act == "share":
item, handle = add_to item, handle = add_to
context["pickform"] = PickForm("Pick a person", context["pickform"] = PickForm("Pick a person",
Person, Person,
@@ -356,7 +356,7 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "save-share": elif act == "save-share":
item, handle = add_to # ("Family", handle) item, handle = add_to # ("Family", handle)
pickform = PickForm("Pick a person", pickform = PickForm("Pick a person",
Person, Person,
@@ -378,18 +378,18 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = "family" context["object_type"] = "family"
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action in ["edit", "view"]: elif act in ["edit", "view"]:
pf, nf, sf, person = get_person_forms(handle, empty=False) pf, nf, sf, person = get_person_forms(handle, empty=False)
if action == "edit": if act == "edit":
logform = LogForm() logform = LogForm()
elif action == "add": elif act == "add":
pf, nf, sf, person = get_person_forms(handle=None, protect=False, empty=True) pf, nf, sf, person = get_person_forms(handle=None, protect=False, empty=True)
logform = LogForm() logform = LogForm()
elif action == "delete": elif act == "delete":
pf, nf, sf, person = get_person_forms(handle, protect=False, empty=True) pf, nf, sf, person = get_person_forms(handle, protect=False, empty=True)
person.delete() person.delete()
return redirect("/person/%s" % build_search(request)) return redirect("/person/%s" % build_search(request))
elif action in ["save", "create"]: # could be create a new person elif act in ["save", "create"]: # could be create a new person
# look up old data, if any: # look up old data, if any:
logform = LogForm(request.POST) logform = LogForm(request.POST)
if handle: if handle:
@@ -434,7 +434,7 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
surname.primary = True # FIXME: why is this False? Remove from form? surname.primary = True # FIXME: why is this False? Remove from form?
surname.save() surname.save()
# FIXME: put this in correct place to get correct cache, before changes: # FIXME: put this in correct place to get correct cache, before changes:
make_log(person, action, request.user.username, logform.cleaned_data["reason"], person.cache) make_log(person, act, request.user.username, logform.cleaned_data["reason"], person.cache)
if add_to: # Adding a child to the family if add_to: # Adding a child to the family
item, handle = add_to # ("Family", handle) item, handle = add_to # ("Family", handle)
model = dji.get_model(item) # what model? model = dji.get_model(item) # what model?
@@ -449,9 +449,9 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
else: else:
# need to edit again # need to edit again
if handle: if handle:
action = "edit" act = "edit"
else: else:
action = "add" act = "add"
else: # error? else: # error?
raise Http404(_("Requested %s does not exist.") % "person") raise Http404(_("Requested %s does not exist.") % "person")
else: # not authenticated else: # not authenticated
@@ -464,7 +464,7 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
raise Http404(_("Requested %s does not exist.") % "person") raise Http404(_("Requested %s does not exist.") % "person")
pf, nf, sf, person = get_person_forms(handle, protect=True) pf, nf, sf, person = get_person_forms(handle, protect=True)
# END NON-AUTHENTICATED ACCESS # END NON-AUTHENTICATED ACCESS
context["action"] = action context["action"] = act
context["view"] = "person" context["view"] = "person"
context["tview"] = _("Person") context["tview"] = _("Person")
context["tviews"] = _("People") context["tviews"] = _("People")

30
src/webapp/grampsdb/view/place.py
View File

@@ -34,9 +34,9 @@ from django.template import Context, RequestContext
## Globals ## Globals
dji = DjangoInterface() dji = DjangoInterface()
def process_place(request, context, handle, action, add_to=None): # view, edit, save def process_place(request, context, handle, act, add_to=None): # view, edit, save
""" """
Process action on person. Can return a redirect. Process act on person. Can return a redirect.
""" """
context["tview"] = _("Place") context["tview"] = _("Place")
context["tviews"] = _("Places") context["tviews"] = _("Places")
@@ -44,20 +44,20 @@ def process_place(request, context, handle, action, add_to=None): # view, edit,
view_template = "view_place_detail.html" view_template = "view_place_detail.html"
if handle == "add": if handle == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
# Handle: edit, view, add, create, save, delete # Handle: edit, view, add, create, save, delete
if action == "add": if act == "add":
place = Place(gramps_id=dji.get_next_id(Place, "P")) place = Place(gramps_id=dji.get_next_id(Place, "P"))
placeform = PlaceForm(instance=place) placeform = PlaceForm(instance=place)
placeform.model = place placeform.model = place
elif action in ["view", "edit"]: elif act in ["view", "edit"]:
place = Place.objects.get(handle=handle) place = Place.objects.get(handle=handle)
placeform = PlaceForm(instance=place) placeform = PlaceForm(instance=place)
placeform.model = place placeform.model = place
elif action == "save": elif act == "save":
place = Place.objects.get(handle=handle) place = Place.objects.get(handle=handle)
placeform = PlaceForm(request.POST, instance=place) placeform = PlaceForm(request.POST, instance=place)
placeform.model = place placeform.model = place
@@ -65,10 +65,10 @@ def process_place(request, context, handle, action, add_to=None): # view, edit,
update_last_changed(place, request.user.username) update_last_changed(place, request.user.username)
place = placeform.save() place = placeform.save()
dji.rebuild_cache(place) dji.rebuild_cache(place)
action = "view" act = "view"
else: else:
action = "edit" act = "edit"
elif action == "create": elif act == "create":
place = Place(handle=create_id()) place = Place(handle=create_id())
placeform = PlaceForm(request.POST, instance=place) placeform = PlaceForm(request.POST, instance=place)
placeform.model = place placeform.model = place
@@ -83,19 +83,19 @@ def process_place(request, context, handle, action, add_to=None): # view, edit,
dji.add_place_ref(obj, place.handle) dji.add_place_ref(obj, place.handle)
dji.rebuild_cache(obj) dji.rebuild_cache(obj)
return redirect("/%s/%s#tab-places" % (item, handle)) return redirect("/%s/%s#tab-places" % (item, handle))
action = "view" act = "view"
else: else:
action = "add" act = "add"
elif action == "delete": elif act == "delete":
place = Place.objects.get(handle=handle) place = Place.objects.get(handle=handle)
place.delete() place.delete()
return redirect("/place/") return redirect("/place/")
else: else:
raise Exception("Unhandled action: '%s'" % action) raise Exception("Unhandled act: '%s'" % act)
context["placeform"] = placeform context["placeform"] = placeform
context["object"] = place context["object"] = place
context["place"] = place context["place"] = place
context["action"] = action context["action"] = act
return render_to_response(view_template, context) return render_to_response(view_template, context)

34
src/webapp/grampsdb/view/repository.py
View File

@@ -34,9 +34,9 @@ from django.template import Context, RequestContext
## Globals ## Globals
dji = DjangoInterface() dji = DjangoInterface()
def process_repository(request, context, handle, action, add_to=None): # view, edit, save def process_repository(request, context, handle, act, add_to=None): # view, edit, save
""" """
Process action on person. Can return a redirect. Process act on person. Can return a redirect.
""" """
context["tview"] = _("Repository") context["tview"] = _("Repository")
context["tviews"] = _("Repositories") context["tviews"] = _("Repositories")
@@ -44,12 +44,12 @@ def process_repository(request, context, handle, action, add_to=None): # view, e
view_template = "view_repository_detail.html" view_template = "view_repository_detail.html"
if handle == "add": if handle == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
# Handle: edit, view, add, create, save, delete, share, save-share # Handle: edit, view, add, create, save, delete, share, save-share
if action == "share": if act == "share":
item, handle = add_to item, handle = add_to
context["pickform"] = PickForm("Pick repository", context["pickform"] = PickForm("Pick repository",
Repository, Repository,
@@ -58,7 +58,7 @@ def process_repository(request, context, handle, action, add_to=None): # view, e
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "save-share": elif act == "save-share":
item, handle = add_to item, handle = add_to
pickform = PickForm("Pick repository", pickform = PickForm("Pick repository",
Repository, Repository,
@@ -77,15 +77,15 @@ def process_repository(request, context, handle, action, add_to=None): # view, e
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "add": elif act == "add":
repository = Repository(gramps_id=dji.get_next_id(Repository, "R")) repository = Repository(gramps_id=dji.get_next_id(Repository, "R"))
repositoryform = RepositoryForm(instance=repository) repositoryform = RepositoryForm(instance=repository)
repositoryform.model = repository repositoryform.model = repository
elif action in ["view", "edit"]: elif act in ["view", "edit"]:
repository = Repository.objects.get(handle=handle) repository = Repository.objects.get(handle=handle)
repositoryform = RepositoryForm(instance=repository) repositoryform = RepositoryForm(instance=repository)
repositoryform.model = repository repositoryform.model = repository
elif action == "save": elif act == "save":
repository = Repository.objects.get(handle=handle) repository = Repository.objects.get(handle=handle)
repositoryform = RepositoryForm(request.POST, instance=repository) repositoryform = RepositoryForm(request.POST, instance=repository)
repositoryform.model = repository repositoryform.model = repository
@@ -93,10 +93,10 @@ def process_repository(request, context, handle, action, add_to=None): # view, e
update_last_changed(repository, request.user.username) update_last_changed(repository, request.user.username)
repository = repositoryform.save() repository = repositoryform.save()
dji.rebuild_cache(repository) dji.rebuild_cache(repository)
action = "view" act = "view"
else: else:
action = "edit" act = "edit"
elif action == "create": elif act == "create":
repository = Repository(handle=create_id()) repository = Repository(handle=create_id())
repositoryform = RepositoryForm(request.POST, instance=repository) repositoryform = RepositoryForm(request.POST, instance=repository)
repositoryform.model = repository repositoryform.model = repository
@@ -111,20 +111,20 @@ def process_repository(request, context, handle, action, add_to=None): # view, e
dji.add_repository_ref_default(obj, repository) dji.add_repository_ref_default(obj, repository)
dji.rebuild_cache(obj) dji.rebuild_cache(obj)
return redirect("/%s/%s#tab-repositories" % (item, handle)) return redirect("/%s/%s#tab-repositories" % (item, handle))
action = "view" act = "view"
else: else:
action = "add" act = "add"
elif action == "delete": elif act == "delete":
repository = Repository.objects.get(handle=handle) repository = Repository.objects.get(handle=handle)
repository.delete() repository.delete()
return redirect("/repository/") return redirect("/repository/")
else: else:
raise Exception("Unhandled action: '%s'" % action) raise Exception("Unhandled act: '%s'" % act)
context["repositoryform"] = repositoryform context["repositoryform"] = repositoryform
context["object"] = repository context["object"] = repository
context["repository"] = repository context["repository"] = repository
context["action"] = action context["action"] = act
return render_to_response(view_template, context) return render_to_response(view_template, context)

34
src/webapp/grampsdb/view/source.py
View File

@@ -34,9 +34,9 @@ from django.template import Context, RequestContext
## Globals ## Globals
dji = DjangoInterface() dji = DjangoInterface()
def process_source(request, context, handle, action, add_to=None): # view, edit, save def process_source(request, context, handle, act, add_to=None): # view, edit, save
""" """
Process action on person. Can return a redirect. Process act on person. Can return a redirect.
""" """
context["tview"] = _("Source") context["tview"] = _("Source")
context["tviews"] = _("Sources") context["tviews"] = _("Sources")
@@ -44,12 +44,12 @@ def process_source(request, context, handle, action, add_to=None): # view, edit,
view_template = "view_source_detail.html" view_template = "view_source_detail.html"
if handle == "add": if handle == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
# Handle: edit, view, add, create, save, delete, share, save-share # Handle: edit, view, add, create, save, delete, share, save-share
if action == "share": if act == "share":
item, handle = add_to item, handle = add_to
context["pickform"] = PickForm("Pick source", context["pickform"] = PickForm("Pick source",
Source, Source,
@@ -58,7 +58,7 @@ def process_source(request, context, handle, action, add_to=None): # view, edit,
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "save-share": elif act == "save-share":
item, handle = add_to item, handle = add_to
pickform = PickForm("Pick source", pickform = PickForm("Pick source",
Source, Source,
@@ -77,15 +77,15 @@ def process_source(request, context, handle, action, add_to=None): # view, edit,
context["object_handle"] = handle context["object_handle"] = handle
context["object_type"] = item context["object_type"] = item
return render_to_response("pick.html", context) return render_to_response("pick.html", context)
elif action == "add": elif act == "add":
source = Source(gramps_id=dji.get_next_id(Source, "S")) source = Source(gramps_id=dji.get_next_id(Source, "S"))
sourceform = SourceForm(instance=source) sourceform = SourceForm(instance=source)
sourceform.model = source sourceform.model = source
elif action in ["view", "edit"]: elif act in ["view", "edit"]:
source = Source.objects.get(handle=handle) source = Source.objects.get(handle=handle)
sourceform = SourceForm(instance=source) sourceform = SourceForm(instance=source)
sourceform.model = source sourceform.model = source
elif action == "save": elif act == "save":
source = Source.objects.get(handle=handle) source = Source.objects.get(handle=handle)
sourceform = SourceForm(request.POST, instance=source) sourceform = SourceForm(request.POST, instance=source)
sourceform.model = source sourceform.model = source
@@ -93,10 +93,10 @@ def process_source(request, context, handle, action, add_to=None): # view, edit,
update_last_changed(source, request.user.username) update_last_changed(source, request.user.username)
source = sourceform.save() source = sourceform.save()
dji.rebuild_cache(source) dji.rebuild_cache(source)
action = "view" act = "view"
else: else:
action = "edit" act = "edit"
elif action == "create": elif act == "create":
source = Source(handle=create_id()) source = Source(handle=create_id())
sourceform = SourceForm(request.POST, instance=source) sourceform = SourceForm(request.POST, instance=source)
sourceform.model = source sourceform.model = source
@@ -106,20 +106,20 @@ def process_source(request, context, handle, action, add_to=None): # view, edit,
dji.rebuild_cache(source) dji.rebuild_cache(source)
if add_to: if add_to:
raise Exception("Cannot add reference") raise Exception("Cannot add reference")
action = "view" act = "view"
else: else:
action = "add" act = "add"
elif action == "delete": elif act == "delete":
source = Source.objects.get(handle=handle) source = Source.objects.get(handle=handle)
source.delete() source.delete()
return redirect("/source/") return redirect("/source/")
else: else:
raise Exception("Unhandled action: '%s'" % action) raise Exception("Unhandled act: '%s'" % act)
context["sourceform"] = sourceform context["sourceform"] = sourceform
context["object"] = source context["object"] = source
context["source"] = source context["source"] = source
context["action"] = action context["action"] = act
return render_to_response(view_template, context) return render_to_response(view_template, context)

30
src/webapp/grampsdb/view/tag.py
View File

@@ -34,9 +34,9 @@ from django.template import Context, RequestContext
## Globals ## Globals
dji = DjangoInterface() dji = DjangoInterface()
def process_tag(request, context, handle, action, add_to=None): # view, edit, save def process_tag(request, context, handle, act, add_to=None): # view, edit, save
""" """
Process action on person. Can return a redirect. Process act on person. Can return a redirect.
""" """
context["tview"] = _("Tag") context["tview"] = _("Tag")
context["tviews"] = _("Tags") context["tviews"] = _("Tags")
@@ -44,20 +44,20 @@ def process_tag(request, context, handle, action, add_to=None): # view, edit, sa
view_template = "view_tag_detail.html" view_template = "view_tag_detail.html"
if handle == "add": if handle == "add":
action = "add" act = "add"
if request.POST.has_key("action"): if request.POST.has_key("action"):
action = request.POST.get("action") act = request.POST.get("action")
# Handle: edit, view, add, create, save, delete # Handle: edit, view, add, create, save, delete
if action == "add": if act == "add":
tag = Tag() tag = Tag()
tagform = TagForm(instance=tag) tagform = TagForm(instance=tag)
tagform.model = tag tagform.model = tag
elif action in ["view", "edit"]: elif act in ["view", "edit"]:
tag = Tag.objects.get(handle=handle) tag = Tag.objects.get(handle=handle)
tagform = TagForm(instance=tag) tagform = TagForm(instance=tag)
tagform.model = tag tagform.model = tag
elif action == "save": elif act == "save":
tag = Tag.objects.get(handle=handle) tag = Tag.objects.get(handle=handle)
tagform = TagForm(request.POST, instance=tag) tagform = TagForm(request.POST, instance=tag)
tagform.model = tag tagform.model = tag
@@ -65,10 +65,10 @@ def process_tag(request, context, handle, action, add_to=None): # view, edit, sa
update_last_changed(tag, request.user.username) update_last_changed(tag, request.user.username)
tag = tagform.save() tag = tagform.save()
dji.rebuild_cache(tag) dji.rebuild_cache(tag)
action = "view" act = "view"
else: else:
action = "edit" act = "edit"
elif action == "create": elif act == "create":
tag = Tag(handle=create_id()) tag = Tag(handle=create_id())
tagform = TagForm(request.POST, instance=tag) tagform = TagForm(request.POST, instance=tag)
tagform.model = tag tagform.model = tag
@@ -83,19 +83,19 @@ def process_tag(request, context, handle, action, add_to=None): # view, edit, sa
dji.add_tag_ref_default(obj, tag) dji.add_tag_ref_default(obj, tag)
dji.rebuild_cache(obj) dji.rebuild_cache(obj)
return redirect("/%s/%s#tab-tags" % (item, handle)) return redirect("/%s/%s#tab-tags" % (item, handle))
action = "view" act = "view"
else: else:
action = "add" act = "add"
elif action == "delete": elif act == "delete":
tag = Tag.objects.get(handle=handle) tag = Tag.objects.get(handle=handle)
tag.delete() tag.delete()
return redirect("/tag/") return redirect("/tag/")
else: else:
raise Exception("Unhandled action: '%s'" % action) raise Exception("Unhandled act: '%s'" % act)
context["tagform"] = tagform context["tagform"] = tagform
context["object"] = tag context["object"] = tag
context["tag"] = tag context["tag"] = tag
context["action"] = action context["action"] = act
return render_to_response(view_template, context) return render_to_response(view_template, context)

110
src/webapp/utils.py
View File

@@ -293,7 +293,7 @@ def make_button(text, url, *args):
return mark_safe("""<input type="button" value="%s" onclick="document.location.href='%s%s%s'"/>""" % return mark_safe("""<input type="button" value="%s" onclick="document.location.href='%s%s%s'"/>""" %
(text, url, kwargs, last)) (text, url, kwargs, last))
def event_table(obj, user, action, url, args): def event_table(obj, user, act, url, args):
retval = "" retval = ""
table = Table("event_table") table = Table("event_table")
table.columns( table.columns(
@@ -318,14 +318,14 @@ def event_table(obj, user, action, url, args):
get_title(djevent.place), get_title(djevent.place),
str(event_ref.role_type)) str(event_ref.role_type))
retval += table.get_html() retval += table.get_html()
if user.is_superuser and action == "view": if user.is_superuser and act == "view":
retval += make_button(_("Add New Event"), (url % args).replace("$act", "add")) retval += make_button(_("Add New Event"), (url % args).replace("$act", "add"))
retval += make_button(_("Add Existing Event"), (url % args).replace("$act", "share")) retval += make_button(_("Add Existing Event"), (url % args).replace("$act", "share"))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def history_table(obj, user, action): def history_table(obj, user, act):
retval = "" retval = ""
table = Table("history_table") table = Table("history_table")
table.columns( table.columns(
@@ -350,7 +350,7 @@ def history_table(obj, user, action):
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def name_table(obj, user, action, url=None, *args): def name_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("name_table") table = Table("name_table")
table.columns(_("Name"), table.columns(_("Name"),
@@ -382,13 +382,13 @@ def name_table(obj, user, action, url=None, *args):
(url % name.person.handle) + ("/%s" % name.order))) (url % name.person.handle) + ("/%s" % name.order)))
table.links(links) table.links(links)
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add Name"), (url % args)) retval += make_button(_("Add Name"), (url % args))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def surname_table(obj, user, action, url=None, *args): def surname_table(obj, user, act, url=None, *args):
person_handle = args[0] person_handle = args[0]
order = args[1] order = args[1]
retval = "" retval = ""
@@ -405,13 +405,13 @@ def surname_table(obj, user, action, url=None, *args):
retval += table.get_html() retval += table.get_html()
else: else:
retval += "<p id='error'>No such name order = %s</p>" % order retval += "<p id='error'>No such name order = %s</p>" % order
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add Surname"), (url % args)) retval += make_button(_("Add Surname"), (url % args))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def citation_table(obj, user, action, url=None, *args): def citation_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("citation_table") table = Table("citation_table")
table.columns(_("ID"), table.columns(_("ID"),
@@ -430,14 +430,14 @@ def citation_table(obj, user, action, url=None, *args):
str(citation.page), str(citation.page),
) )
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add New Citation"), (url % args).replace("$act", "add")) retval += make_button(_("Add New Citation"), (url % args).replace("$act", "add"))
retval += make_button(_("Add Existing Citation"), (url % args).replace("$act", "share")) retval += make_button(_("Add Existing Citation"), (url % args).replace("$act", "share"))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def repository_table(obj, user, action, url=None, *args): def repository_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("repository_table") table = Table("repository_table")
table.columns( table.columns(
@@ -447,14 +447,14 @@ def repository_table(obj, user, action, url=None, *args):
if user.is_authenticated(): if user.is_authenticated():
pass pass
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add New Repository"), (url % args).replace("$act", "add")) retval += make_button(_("Add New Repository"), (url % args).replace("$act", "add"))
retval += make_button(_("Add Existing Repository"), (url % args).replace("$act", "share")) retval += make_button(_("Add Existing Repository"), (url % args).replace("$act", "share"))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def note_table(obj, user, action, url=None, *args): def note_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("note_table") table = Table("note_table")
table.columns( table.columns(
@@ -472,14 +472,14 @@ def note_table(obj, user, action, url=None, *args):
str(note_ref.ref_object.note_type), str(note_ref.ref_object.note_type),
note_ref.ref_object.text[:50]) note_ref.ref_object.text[:50])
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add New Note"), (url % args).replace("$act", "add")) retval += make_button(_("Add New Note"), (url % args).replace("$act", "add"))
retval += make_button(_("Add Existing Note"), (url % args).replace("$act", "share")) retval += make_button(_("Add Existing Note"), (url % args).replace("$act", "share"))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def data_table(obj, user, action, url=None, *args): def data_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("data_table") table = Table("data_table")
table.columns(_("Type"), table.columns(_("Type"),
@@ -488,13 +488,13 @@ def data_table(obj, user, action, url=None, *args):
if user.is_authenticated(): if user.is_authenticated():
pass pass
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add Data"), (url % args)) retval += make_button(_("Add Data"), (url % args))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def attribute_table(obj, user, action, url=None, *args): def attribute_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("attribute_table") table = Table("attribute_table")
table.columns(_("Type"), table.columns(_("Type"),
@@ -508,13 +508,13 @@ def attribute_table(obj, user, action, url=None, *args):
table.row(attribute.attribute_type.name, table.row(attribute.attribute_type.name,
attribute.value) attribute.value)
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add Attribute"), (url % args)) retval += make_button(_("Add Attribute"), (url % args))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def address_table(obj, user, action, url=None, *args): def address_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("address_table") table = Table("address_table")
table.columns(_("Date"), table.columns(_("Date"),
@@ -532,13 +532,13 @@ def address_table(obj, user, action, url=None, *args):
location.state, location.state,
location.country) location.country)
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add Address"), (url % args)) retval += make_button(_("Add Address"), (url % args))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def location_table(obj, user, action, url=None, *args): def location_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("location_table") table = Table("location_table")
table.columns(_("Date"), table.columns(_("Date"),
@@ -549,13 +549,13 @@ def location_table(obj, user, action, url=None, *args):
if user.is_authenticated(): if user.is_authenticated():
pass # FIXME pass # FIXME
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add Address"), (url % args)) retval += make_button(_("Add Address"), (url % args))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def media_table(obj, user, action, url=None, *args): def media_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("media_table") table = Table("media_table")
table.columns(_("Description"), table.columns(_("Description"),
@@ -573,14 +573,14 @@ def media_table(obj, user, action, url=None, *args):
str(media_ref.ref_object.desc), str(media_ref.ref_object.desc),
media_ref.ref_object.path) media_ref.ref_object.path)
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add New Media"), (url % args).replace("$act", "add")) retval += make_button(_("Add New Media"), (url % args).replace("$act", "add"))
retval += make_button(_("Add Existing Media"), (url % args).replace("$act", "share")) retval += make_button(_("Add Existing Media"), (url % args).replace("$act", "share"))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def internet_table(obj, user, action, url=None, *args): def internet_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("internet_table") table = Table("internet_table")
table.columns(_("Type"), table.columns(_("Type"),
@@ -593,13 +593,13 @@ def internet_table(obj, user, action, url=None, *args):
url_obj.path, url_obj.path,
url_obj.desc) url_obj.desc)
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add Internet"), (str(url) % args)) retval += make_button(_("Add Internet"), (str(url) % args))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def association_table(obj, user, action, url=None, *args): def association_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("association_table") table = Table("association_table")
table.columns(_("Name"), table.columns(_("Name"),
@@ -612,13 +612,13 @@ def association_table(obj, user, action, url=None, *args):
for association in associations: for association in associations:
table.row() table.row()
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add Association"), (url % args)) retval += make_button(_("Add Association"), (url % args))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def lds_table(obj, user, action, url=None, *args): def lds_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("lds_table") table = Table("lds_table")
table.columns(_("Type"), table.columns(_("Type"),
@@ -636,13 +636,13 @@ def lds_table(obj, user, action, url=None, *args):
lds.temple, lds.temple,
get_title(lds.place)) get_title(lds.place))
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add LDS"), (url % args)) retval += make_button(_("Add LDS"), (url % args))
else: else:
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def reference_table(obj, user, action, url=None, *args): def reference_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("reference_table") table = Table("reference_table")
table.columns( table.columns(
@@ -655,14 +655,14 @@ def reference_table(obj, user, action, url=None, *args):
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def person_reference_table(obj, user, action): def person_reference_table(obj, user, act):
retval = "" retval = ""
table = Table("person_reference_table") table = Table("person_reference_table")
table.columns( table.columns(
_("Type"), _("Type"),
_("Reference"), _("Reference"),
_("ID")) _("ID"))
if user.is_authenticated() and action != "add": if user.is_authenticated() and act != "add":
for reference in obj.families.all(): for reference in obj.families.all():
table.row( table.row(
_("Family (spouse in)"), _("Family (spouse in)"),
@@ -677,14 +677,14 @@ def person_reference_table(obj, user, action):
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def note_reference_table(obj, user, action): def note_reference_table(obj, user, act):
retval = "" retval = ""
table = Table("note_reference_table") table = Table("note_reference_table")
table.columns( table.columns(
_("Type"), _("Type"),
_("Reference"), _("Reference"),
_("ID")) _("ID"))
if user.is_authenticated() and action != "add": if user.is_authenticated() and act != "add":
for reference in models.NoteRef.objects.filter(ref_object=obj): for reference in models.NoteRef.objects.filter(ref_object=obj):
ref_from_class = reference.object_type.model_class() ref_from_class = reference.object_type.model_class()
item = ref_from_class.objects.get(id=reference.object_id) item = ref_from_class.objects.get(id=reference.object_id)
@@ -696,14 +696,14 @@ def note_reference_table(obj, user, action):
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def event_reference_table(obj, user, action): def event_reference_table(obj, user, act):
retval = "" retval = ""
table = Table("event_reference_table") table = Table("event_reference_table")
table.columns( table.columns(
_("Type"), _("Type"),
_("Reference"), _("Reference"),
_("ID")) _("ID"))
if user.is_authenticated() and action != "add": if user.is_authenticated() and act != "add":
for reference in models.EventRef.objects.filter(ref_object=obj): for reference in models.EventRef.objects.filter(ref_object=obj):
ref_from_class = reference.object_type.model_class() ref_from_class = reference.object_type.model_class()
item = ref_from_class.objects.get(id=reference.object_id) item = ref_from_class.objects.get(id=reference.object_id)
@@ -715,14 +715,14 @@ def event_reference_table(obj, user, action):
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def repository_reference_table(obj, user, action): def repository_reference_table(obj, user, act):
retval = "" retval = ""
table = Table("repository_reference_table") table = Table("repository_reference_table")
table.columns( table.columns(
_("Type"), _("Type"),
_("Reference"), _("Reference"),
_("ID")) _("ID"))
if user.is_authenticated() and action != "add": if user.is_authenticated() and act != "add":
for reference in models.RepositoryRef.objects.filter(ref_object=obj): for reference in models.RepositoryRef.objects.filter(ref_object=obj):
ref_from_class = reference.object_type.model_class() ref_from_class = reference.object_type.model_class()
item = ref_from_class.objects.get(id=reference.object_id) item = ref_from_class.objects.get(id=reference.object_id)
@@ -734,7 +734,7 @@ def repository_reference_table(obj, user, action):
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def citation_reference_table(obj, user, action): def citation_reference_table(obj, user, act):
retval = "" retval = ""
table = Table("citation_reference_table") table = Table("citation_reference_table")
table.columns( table.columns(
@@ -742,7 +742,7 @@ def citation_reference_table(obj, user, action):
_("Reference"), _("Reference"),
# _("ID") # _("ID")
) )
if user.is_authenticated() and action != "add": if user.is_authenticated() and act != "add":
for reference in models.CitationRef.objects.filter(citation=obj): for reference in models.CitationRef.objects.filter(citation=obj):
ref_from_class = reference.object_type.model_class() ref_from_class = reference.object_type.model_class()
item = ref_from_class.objects.get(id=reference.object_id) item = ref_from_class.objects.get(id=reference.object_id)
@@ -753,28 +753,28 @@ def citation_reference_table(obj, user, action):
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def source_reference_table(obj, user, action): def source_reference_table(obj, user, act):
retval = "" retval = ""
table = Table("source_reference_table") table = Table("source_reference_table")
table.columns( table.columns(
_("Type"), _("Type"),
_("Reference"), _("Reference"),
_("ID")) _("ID"))
if user.is_authenticated() and action != "add": if user.is_authenticated() and act != "add":
pass pass
# FIXME: where is source ref? # FIXME: where is source ref?
retval += table.get_html() retval += table.get_html()
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def media_reference_table(obj, user, action): def media_reference_table(obj, user, act):
retval = "" retval = ""
table = Table("media_reference_table") table = Table("media_reference_table")
table.columns( table.columns(
_("Type"), _("Type"),
_("Reference"), _("Reference"),
_("ID")) _("ID"))
if user.is_authenticated() and action != "add": if user.is_authenticated() and act != "add":
for reference in models.MediaRef.objects.filter(ref_object=obj): for reference in models.MediaRef.objects.filter(ref_object=obj):
ref_from_class = reference.object_type.model_class() ref_from_class = reference.object_type.model_class()
item = ref_from_class.objects.get(id=reference.object_id) item = ref_from_class.objects.get(id=reference.object_id)
@@ -786,27 +786,27 @@ def media_reference_table(obj, user, action):
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def place_reference_table(obj, user, action): def place_reference_table(obj, user, act):
retval = "" retval = ""
table = Table("place_reference_table") table = Table("place_reference_table")
table.columns( table.columns(
_("Type"), _("Type"),
_("Reference"), _("Reference"),
_("ID")) _("ID"))
if user.is_authenticated() and action != "add": if user.is_authenticated() and act != "add":
pass # FIXME pass # FIXME
retval += table.get_html() retval += table.get_html()
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def tag_reference_table(obj, user, action): def tag_reference_table(obj, user, act):
retval = "" retval = ""
table = Table("tag_reference_table") table = Table("tag_reference_table")
table.columns( table.columns(
_("Type"), _("Type"),
_("Reference"), _("Reference"),
_("ID")) _("ID"))
if user.is_authenticated() and action != "add": if user.is_authenticated() and act != "add":
querysets = [obj.person_set, obj.family_set, obj.note_set, obj.media_set] querysets = [obj.person_set, obj.family_set, obj.note_set, obj.media_set]
for queryset in querysets: for queryset in querysets:
for item in queryset.all(): for item in queryset.all():
@@ -818,7 +818,7 @@ def tag_reference_table(obj, user, action):
retval += nbsp("") # to keep tabs same height retval += nbsp("") # to keep tabs same height
return retval return retval
def children_table(obj, user, action, url=None, *args): def children_table(obj, user, act, url=None, *args):
retval = "" retval = ""
table = Table("children_table") table = Table("children_table")
table.columns( table.columns(
@@ -866,7 +866,7 @@ def children_table(obj, user, action, url=None, *args):
count += 1 count += 1
table.links(links) table.links(links)
retval += table.get_html() retval += table.get_html()
if user.is_superuser and url and action == "view": if user.is_superuser and url and act == "view":
retval += make_button(_("Add New Person as Child"), (url.replace("$act", "add") % args)) retval += make_button(_("Add New Person as Child"), (url.replace("$act", "add") % args))
retval += make_button(_("Add Existing Person as Child"), (url.replace("$act", "share") % args)) retval += make_button(_("Add Existing Person as Child"), (url.replace("$act", "share") % args))
else: else:
@@ -905,16 +905,16 @@ def display_date(obj):
else: else:
return "" return ""
def media_link(handle, user, action): def media_link(handle, user, act):
retval = """<a href="%s"><img src="%s" /></a>""" % ( retval = """<a href="%s"><img src="%s" /></a>""" % (
"/media/%s/full" % handle, "/media/%s/full" % handle,
"/media/%s/thumbnail" % handle) "/media/%s/thumbnail" % handle)
return retval return retval
def render(formfield, user, action, id=None, url=None, *args): def render(formfield, user, act, id=None, url=None, *args):
if not user.is_authenticated(): if not user.is_authenticated():
action = "view" act = "view"
if action == "view": # show as text if act == "view": # show as text
fieldname = formfield.name # 'surname' fieldname = formfield.name # 'surname'
try: try:
item = getattr(formfield.form.model, fieldname) item = getattr(formfield.form.model, fieldname)
@@ -945,7 +945,7 @@ def render(formfield, user, action, id=None, url=None, *args):
retval = formfield.as_widget() retval = formfield.as_widget()
return retval return retval
def render_name(name, user, action=None): def render_name(name, user, act=None):
""" """
Given a Django or Gramps object, render the name and return. This Given a Django or Gramps object, render the name and return. This
function uses authentication, privacy and probably_alive settings. function uses authentication, privacy and probably_alive settings.