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

Bug 3873: Narrative web site crashes when both living and private filters are active

Browse Source 
svn: r15276
This commit is contained in:
Gerald Britton 2010-04-23 18:40:27 +00:00
parent 32d363fb7f
commit db67f8de2a
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/gen/proxy/private.py
View File

@ -179,7 +179,7 @@ class PrivateProxyDb(ProxyDbBase):
If no such Source exists, None is returned. If no such Source exists, None is returned.
""" """
source = self.db.get_source_from_gramps_id(val) source = self.db.get_source_from_gramps_id(val)
if not source.get_privacy(): if source and not source.get_privacy():
return sanitize_source(self.db, source) return sanitize_source(self.db, source)
return None return None
@ -419,10 +419,10 @@ def copy_media_ref_list(db, original_obj, clean_obj):
@returns: Nothing @returns: Nothing
""" """
for media_ref in original_obj.get_media_list(): for media_ref in original_obj.get_media_list():
if not media_ref.get_privacy(): if media_ref and not media_ref.get_privacy():
handle = media_ref.get_reference_handle() handle = media_ref.get_reference_handle()
media_object = db.get_object_from_handle(handle) media_object = db.get_object_from_handle(handle)
if not media_object.get_privacy(): if media_object and not media_object.get_privacy():
clean_obj.add_media_reference(sanitize_media_ref(db, media_ref)) clean_obj.add_media_reference(sanitize_media_ref(db, media_ref))
def copy_source_ref_list(db, original_obj, clean_obj): def copy_source_ref_list(db, original_obj, clean_obj):
@ -439,10 +439,10 @@ def copy_source_ref_list(db, original_obj, clean_obj):
@returns: Nothing @returns: Nothing
""" """
for ref in original_obj.get_source_references(): for ref in original_obj.get_source_references():
if not ref.get_privacy(): if ref and not ref.get_privacy():
handle = ref.get_reference_handle() handle = ref.get_reference_handle()
source = db.get_source_from_handle(handle) source = db.get_source_from_handle(handle)
if not source.get_privacy(): if source and not source.get_privacy():
clean_obj.add_source_reference(sanitize_source_ref(db, ref)) clean_obj.add_source_reference(sanitize_source_ref(db, ref))
def copy_notes(db, original_obj, clean_obj): def copy_notes(db, original_obj, clean_obj):
@ -460,7 +460,7 @@ def copy_notes(db, original_obj, clean_obj):
""" """
for note_handle in original_obj.get_note_list(): for note_handle in original_obj.get_note_list():
note = db.get_note_from_handle(note_handle) note = db.get_note_from_handle(note_handle)
if not note.get_privacy(): if note and not note.get_privacy():
clean_obj.add_note(note_handle) clean_obj.add_note(note_handle)
def copy_associations(db, original_obj, clean_obj): def copy_associations(db, original_obj, clean_obj):
@ -498,7 +498,7 @@ def copy_attributes(db, original_obj, clean_obj):
@returns: Nothing @returns: Nothing
""" """
for attribute in original_obj.get_attribute_list(): for attribute in original_obj.get_attribute_list():
if not attribute.get_privacy(): if attribute and not attribute.get_privacy():
new_attribute = Attribute() new_attribute = Attribute()
new_attribute.set_type(attribute.get_type()) new_attribute.set_type(attribute.get_type())
new_attribute.set_value(attribute.get_value()) new_attribute.set_value(attribute.get_value())
@ -520,7 +520,7 @@ def copy_urls(db, original_obj, clean_obj):
@returns: Nothing @returns: Nothing
""" """
for url in original_obj.get_url_list(): for url in original_obj.get_url_list():
if not url.get_privacy(): if url and not url.get_privacy():
clean_obj.add_url(url) clean_obj.add_url(url)
def copy_lds_ords(db, original_obj, clean_obj): def copy_lds_ords(db, original_obj, clean_obj):
@ -537,7 +537,7 @@ def copy_lds_ords(db, original_obj, clean_obj):
@returns: Nothing @returns: Nothing
""" """
for lds_ord in original_obj.get_lds_ord_list(): for lds_ord in original_obj.get_lds_ord_list():
if not lds_ord.get_privacy(): if lds_ord and not lds_ord.get_privacy():
clean_obj.add_lds_ord(sanitize_lds_ord(db, lds_ord)) clean_obj.add_lds_ord(sanitize_lds_ord(db, lds_ord))
def copy_addresses(db, original_obj, clean_obj): def copy_addresses(db, original_obj, clean_obj):
@ -554,7 +554,7 @@ def copy_addresses(db, original_obj, clean_obj):
@returns: Nothing @returns: Nothing
""" """
for address in original_obj.get_address_list(): for address in original_obj.get_address_list():
if not address.get_privacy(): if address and not address.get_privacy():
clean_obj.add_address(sanitize_address(db, address)) clean_obj.add_address(sanitize_address(db, address))
def sanitize_lds_ord(db, lds_ord): def sanitize_lds_ord(db, lds_ord):
@ -761,7 +761,7 @@ def sanitize_person(db, person):
# copy Family reference list # copy Family reference list
for handle in person.get_family_handle_list(): for handle in person.get_family_handle_list():
family = db.get_family_from_handle(handle) family = db.get_family_from_handle(handle)
if not family.get_privacy(): if family and not family.get_privacy():
new_person.add_family_handle(handle) new_person.add_family_handle(handle)
# copy Family reference list # copy Family reference list
@ -771,13 +771,14 @@ def sanitize_person(db, person):
continue continue
child_ref_list = family.get_child_ref_list() child_ref_list = family.get_child_ref_list()
for child_ref in child_ref_list: for child_ref in child_ref_list:
if child_ref.get_reference_handle() == person.get_handle(): if (child_ref and
child_ref.get_reference_handle() == person.get_handle()):
if not child_ref.get_privacy(): if not child_ref.get_privacy():
new_person.add_parent_family_handle(handle) new_person.add_parent_family_handle(handle)
break break
for name in person.get_alternate_names(): for name in person.get_alternate_names():
if not name.get_privacy(): if name and not name.get_privacy():
new_person.add_alternate_name(sanitize_name(db, name)) new_person.add_alternate_name(sanitize_name(db, name))
# set complete flag # set complete flag
@ -843,10 +844,10 @@ def sanitize_source(db, source):
new_source.set_data_map(source.get_data_map()) new_source.set_data_map(source.get_data_map())
for repo_ref in source.get_reporef_list(): for repo_ref in source.get_reporef_list():
if not repo_ref.get_privacy(): if repo_ref and not repo_ref.get_privacy():
handle = repo_ref.get_reference_handle() handle = repo_ref.get_reference_handle()
repo = db.get_repository_from_handle(handle) repo = db.get_repository_from_handle(handle)
if not repo.get_privacy(): if repo and not repo.get_privacy():
new_source.add_repo_reference(RepoRef(repo_ref)) new_source.add_repo_reference(RepoRef(repo_ref))
copy_media_ref_list(db, source, new_source) copy_media_ref_list(db, source, new_source)
@ -980,7 +981,7 @@ def sanitize_family(db, family):
father_handle = family.get_father_handle() father_handle = family.get_father_handle()
if father_handle: if father_handle:
father = db.get_person_from_handle(father_handle) father = db.get_person_from_handle(father_handle)
if not father.get_privacy(): if father and not father.get_privacy():
new_family.set_father_handle(father_handle) new_family.set_father_handle(father_handle)
# Copy the mother handle. # Copy the mother handle.