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

Pass in request to check_preferred

Browse Source 
svn: r19798
This commit is contained in:
Doug Blank 2012-06-08 18:40:21 +00:00
parent 706ae18795
commit e7d4833ea8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,7 +82,7 @@ def check_primary(surname, surnames):
if not ok: if not ok:
surname.primary = True surname.primary = True
def check_preferred(name, person): def check_preferred(request, name, person):
""" """
Check for a proper preferred name. Check for a proper preferred name.
""" """
@ -304,7 +304,7 @@ def process_name(request, handle, order, action="view"):
name.suffix = nf.cleaned_data["suffix"] if nf.cleaned_data["suffix"] != " suffix " else "" name.suffix = nf.cleaned_data["suffix"] if nf.cleaned_data["suffix"] != " suffix " else ""
name.preferred = True # FIXME: why is this False? name.preferred = True # FIXME: why is this False?
update_last_changed(name, request.user.username) update_last_changed(name, request.user.username)
check_preferred(name, person) check_preferred(request, name, person)
name.save() name.save()
# Process data: # Process data:
oldsurname.name = name oldsurname.name = name
@ -381,7 +381,7 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
# Manually set any data: # Manually set any data:
name.suffix = nf.cleaned_data["suffix"] if nf.cleaned_data["suffix"] != " suffix " else "" name.suffix = nf.cleaned_data["suffix"] if nf.cleaned_data["suffix"] != " suffix " else ""
name.preferred = True # FIXME: why is this False? name.preferred = True # FIXME: why is this False?
check_preferred(name, person) check_preferred(request, name, person)
update_last_changed(name, request.user.username) update_last_changed(name, request.user.username)
name.save() name.save()
# Process data: # Process data: