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

Fixes for editing/creating families

Browse Source 
svn: r19833
This commit is contained in:
Doug Blank 2012-06-12 12:31:58 +00:00
parent 6c8b83d58b
commit 7cc1a962ae
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,14 @@ def process_family(request, context, handle, action, add_to=None): # view, edit,
if familyform.is_valid():
update_last_changed(family, request.user.username)
family = familyform.save()
# FIXME: multiple families with same parents?
# FIXME: remove family from previous mother/father?
if family.mother:
if family not in family.mother.families.all():
family.mother.families.add(family)
if family.father:
if family not in family.father.families.all():
family.father.families.add(family)
dji.rebuild_cache(family)
action = "view"
else:
@ -79,12 +87,21 @@ def process_family(request, context, handle, action, add_to=None): # view, edit,
if familyform.is_valid():
update_last_changed(family, request.user.username)
family = familyform.save()
# FIXME: multiple families with same parents?
# FIXME: remove family from previous mother/father?
if family.mother:
if family not in family.mother.families.all():
family.mother.families.add(family)
if family.father:
if family not in family.father.families.all():
family.father.families.add(family)
dji.rebuild_cache(family)
if add_to:
if add_to: # FIXME: add family to... what??
item, handle = add_to
model = dji.get_model(item)
obj = model.objects.get(handle=handle)
dji.add_family_ref(obj, family.handle)
# FIXME: cache; move to save methods? what about forms?
return redirect("/%s/%s" % (item, handle))
action = "view"
else:

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

@ -396,7 +396,7 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
model = dji.get_model(item) # what model?
obj = model.objects.get(handle=handle) # get family
dji.add_child_ref_default(obj, person) # add person to family
person.parent_familes.add(obj) # add family to child
person.parent_families.add(obj) # add family to child
dji.rebuild_cache(person) # rebuild child
dji.rebuild_cache(obj) # rebuild family
return redirect("/%s/%s%s" % (item, handle, build_search(request)))