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

Fixed an error with nbsp's; fixed an error that removed families on edit

Browse Source 
svn: r19825
This commit is contained in:
Doug Blank 2012-06-11 20:46:36 +00:00
parent ef5c99e015
commit a6e30ff4a3
4 changed files with 359 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

603
src/plugins/export/ExportGedcom.py
View File

File diff suppressed because it is too large Load Diff

2
src/webapp/grampsdb/forms.py
View File

@ -34,7 +34,7 @@ class PersonForm(forms.ModelForm):
class Meta: class Meta:
model = Person model = Person
exclude = ["death", "birth", "handle", "birth_ref_index", exclude = ["death", "birth", "handle", "birth_ref_index",
"death_ref_index"] "death_ref_index", "families", "parent_families"]
class NameForm(forms.ModelForm): class NameForm(forms.ModelForm):
class Meta: class Meta:

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

@ -254,7 +254,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]))
# combine with user data: # combine with user data:
nf = NameForm(request.POST, instance=name) nf = NameForm(request.POST, instance=name)
name.id = None # FIXME: why did this get set to an existing name? Should be new. name.id = None # FIXME: why did this get set to an existing name? Should be new. Remove from form?
name.preferred = False name.preferred = False
nf.model = name nf.model = name
sf = SurnameForm(request.POST, instance=surname) sf = SurnameForm(request.POST, instance=surname)
@ -268,7 +268,7 @@ def process_name(request, handle, order, action="view"):
update_last_changed(name, request.user.username) update_last_changed(name, request.user.username)
# 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 = False # FIXME: why is this False? name.preferred = False # FIXME: why is this False? Remove from form?
name.order = next_order name.order = next_order
name.save() name.save()
# Process data: # Process data:
@ -276,7 +276,7 @@ def process_name(request, handle, order, action="view"):
surname.name = name surname.name = name
# Manually set any data: # Manually set any data:
surname.prefix = sf.cleaned_data["prefix"] if sf.cleaned_data["prefix"] != " prefix " else "" surname.prefix = sf.cleaned_data["prefix"] if sf.cleaned_data["prefix"] != " prefix " else ""
surname.primary = True # FIXME: why is this False? surname.primary = True # FIXME: why is this False? Remove from form?
surname.save() surname.save()
dji.rebuild_cache(person) dji.rebuild_cache(person)
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,
@ -302,7 +302,7 @@ def process_name(request, handle, order, action="view"):
name = nf.save() name = nf.save()
# 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? Remove from form?
update_last_changed(name, request.user.username) update_last_changed(name, request.user.username)
check_preferred(request, name, person) check_preferred(request, name, person)
name.save() name.save()
@ -311,7 +311,7 @@ def process_name(request, handle, order, action="view"):
surname = sf.save(commit=False) surname = sf.save(commit=False)
# Manually set any data: # Manually set any data:
surname.prefix = sf.cleaned_data["prefix"] if sf.cleaned_data["prefix"] != " prefix " else "" surname.prefix = sf.cleaned_data["prefix"] if sf.cleaned_data["prefix"] != " prefix " else ""
surname.primary = True # FIXME: why is this False? surname.primary = True # FIXME: why is this False? Remove from form?
surname.save() surname.save()
dji.rebuild_cache(person) dji.rebuild_cache(person)
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,
@ -380,7 +380,7 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
name = nf.save(commit=False) name = nf.save(commit=False)
# 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? Remove from form?
check_preferred(request, 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()
@ -389,7 +389,7 @@ def process_person(request, context, handle, action, add_to=None): # view, edit,
surname = sf.save(commit=False) surname = sf.save(commit=False)
# Manually set any data: # Manually set any data:
surname.prefix = sf.cleaned_data["prefix"] if sf.cleaned_data["prefix"] != " prefix " else "" surname.prefix = sf.cleaned_data["prefix"] if sf.cleaned_data["prefix"] != " prefix " else ""
surname.primary = True # FIXME: why is this False? surname.primary = True # FIXME: why is this False? Remove from form?
surname.save() surname.save()
dji.rebuild_cache(person) dji.rebuild_cache(person)
if add_to: if add_to:

1
src/webapp/utils.py
View File

@ -1196,6 +1196,7 @@ class WebAppParser(HTMLParser):
def parse_styled_text(text): def parse_styled_text(text):
parser = WebAppParser() parser = WebAppParser()
text = text.replace(" ", " ") # otherwise removes them?
parser.feed(text) parser.feed(text)
parser.close() parser.close()
return (parser.text(), parser.tags()) return (parser.text(), parser.tags())