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

Working on PrivateProxy ideas; minor tweaks otherwise

Browse Source 
svn: r13853
This commit is contained in:
Doug Blank
2009-12-20 01:57:17 +00:00
parent 4392fa3120
commit 108ff236f7
11 changed files with 160 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/web/grampsdb/models.py
View File

@@ -344,6 +344,17 @@ class Person(PrimaryObject):
# .lds_set
# .url_set
def get_primary_name(self):
"""
Return the preferred name of a person.
"""
names = self.name_set.all().order_by("order")
if names.count() > 0:
name = names[0]
else:
name = None
return name
class Family(PrimaryObject):
father = models.ForeignKey('Person', related_name="father_ref",
null=True, blank=True)
@@ -456,6 +467,18 @@ class Name(DateObject, SecondaryObject):
["", " "][bool(self.prefix)],
self.surname,
self.first_name)
@staticmethod
def get_dummy():
name = Name()
#name.
def sanitize(self):
self.first_name = "[Private]"
self.prefix = ""
self.suffix = ""
self.prefix = ""
self.prefix = ""
self.prefix = ""
class Lds(DateObject, SecondaryObject):
"""

18
src/web/grampsdb/templatetags/my_tags.py
View File

@@ -48,15 +48,12 @@ register.filter('preview', preview)
make_name.is_safe = True
register.filter('make_name', make_name)
def preferred(name_set, attr):
def preferred(person):
try:
name = name_set.get(preferred=True)
name = person.name_set.get(preferred=True)
except:
return "[No preferred name]"
if name:
return escape(getattr(name, attr))
else:
return "[Missing]"
name = None
return name
preferred.is_safe = True
register.filter('preferred', preferred)
@@ -88,13 +85,6 @@ def table_header(context, headers = None):
register.inclusion_tag('table_header.html',
takes_context=True)(table_header)
def view_navigation(context):
# add things for the view here
return context
register.inclusion_tag('view_navigation.html',
takes_context=True)(view_navigation)
def paginator(context, adjacent_pages=2):
"""
To be used in conjunction with the object_list generic view.

47
src/web/grampsdb/views.py
View File

@@ -42,6 +42,7 @@ from django.db.models import Q
import web
from web.grampsdb.models import *
from web.grampsdb.forms import NameForm
from web.utils import probably_alive
_ = lambda text: text
@@ -82,13 +83,13 @@ def context_processor(request):
def main_page(request):
context = RequestContext(request)
context["view"] = 'home'
context["cview"] = _('Home')
context["tview"] = _('Home')
return render_to_response("main_page.html", context)
def logout_page(request):
context = RequestContext(request)
context["view"] = 'home'
context["cview"] = _('Home')
context["tview"] = _('Home')
logout(request)
return HttpResponseRedirect('/')
@@ -100,7 +101,7 @@ def user_page(request, username):
context = RequestContext(request)
context["username"] = username
context["view"] = 'user'
context["cview"] = _('User')
context["tview"] = _('User')
return render_to_response('user_page.html', context)
def view_name_detail(request, handle, order, action="view"):
@@ -171,7 +172,7 @@ def view_name_detail(request, handle, order, action="view"):
action = "edit"
context = RequestContext(request)
context["action"] = action
context["cview"] = action #_('Name')
context["tview"] = _('Name')
context["view"] = 'name'
context["handle"] = handle
context["id"] = id
@@ -190,67 +191,91 @@ def view_name_detail(request, handle, order, action="view"):
else:
return render_to_response(view_template, context)
class PrivateProxy(object):
def __init__(self, obj):
self.obj = obj
def __getattr__(self, attr):
return getattr(self.obj, attr)
def view_detail(request, view, handle):
context = RequestContext(request)
context["view"] = view
if view == "event":
try:
obj = Event.objects.get(handle=handle)
except:
raise Http404(_("Requested %s does not exist.") % view)
view_template = 'view_event_detail.html'
context["tview"] = _("Event")
elif view == "family":
try:
obj = Family.objects.get(handle=handle)
except:
raise Http404(_("Requested %s does not exist.") % view)
view_template = 'view_family_detail.html'
context["tview"] = _("Family")
elif view == "media":
try:
obj = Media.objects.get(handle=handle)
except:
raise Http404(_("Requested %s does not exist.") % view)
view_template = 'view_media_detail.html'
context["tview"] = _("Media")
elif view == "note":
try:
obj = Note.objects.get(handle=handle)
except:
raise Http404(_("Requested %s does not exist.") % view)
view_template = 'view_note_detail.html'
context["tview"] = _("Note")
elif view == "person":
try:
obj = Person.objects.get(handle=handle)
except:
raise Http404(_("Requested %s does not exist.") % view)
view_template = 'view_person_detail.html'
person = obj
name = person.get_primary_name()
if request.user.is_authenticated():
pass # see everything, no limits
elif probably_alive(person.handle):
name.first_name = "[Living]"
elif person.private:
name = Name()
name.surname = "[Private]"
name.first_name = "[Private]"
# FIXME: protect everything else; what if name.private?
context["name"] = name
context["tview"] = _("Person")
elif view == "place":
try:
obj = Place.objects.get(handle=handle)
except:
raise Http404(_("Requested %s does not exist.") % view)
view_template = 'view_place_detail.html'
context["tview"] = _("Place")
elif view == "repository":
try:
obj = Repository.objects.get(handle=handle)
except:
raise Http404(_("Requested %s does not exist.") % view)
view_template = 'view_repository_detail.html'
context["tview"] = _("Repository")
elif view == "source":
try:
obj = Source.objects.get(handle=handle)
except:
raise Http404(_("Requested %s does not exist.") % view)
view_template = 'view_source_detail.html'
context["tview"] = _("Source")
else:
raise Http404(_("Requested page type not known"))
cview = view.title()
context = RequestContext(request)
context["cview"] = cview
context["view"] = view
context["handle"] = handle
context[view] = obj
return render_to_response(view_template, context)
def view(request, view):
cview = view.title()
search = ""
if view == "event":
if request.user.is_authenticated():
@@ -471,7 +496,7 @@ def view(request, view):
context = RequestContext(request)
context["page"] = page
context["view"] = view
context["cview"] = cview
context["tview"] = _(view.title())
context["search"] = search
context["total"] = total
if search: