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

* src/FamilyView.py: Corrections.

Browse Source 
* src/Marriage.py: Corrections.


svn: r2930
This commit is contained in:
Alex Roitman 2004-02-29 00:08:12 +00:00
parent 8e733036f2
commit ae6f7749b7
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -6,6 +6,8 @@
find_family_no_conflicts): Use str(idVal). find_family_no_conflicts): Use str(idVal).
* src/docgen/AsciiDoc.py: Add to CVS. * src/docgen/AsciiDoc.py: Add to CVS.
* src/Makefile.am, src/Makefile.in: Ship AsciiDoc.py. * src/Makefile.am, src/Makefile.in: Ship AsciiDoc.py.
* src/FamilyView.py: Corrections.
* src/Marriage.py: Corrections.
2004-02-28 Don Allingham <dallingham@users.sourceforge.net> 2004-02-28 Don Allingham <dallingham@users.sourceforge.net>
* src/gramps_main.py: switch to DB as default, remove save option * src/gramps_main.py: switch to DB as default, remove save option

2
src/FamilyView.py
View File

@ -900,7 +900,7 @@ class FamilyView:
def find_marriage(self,family): def find_marriage(self,family):
for event_id in family.get_event_list(): for event_id in family.get_event_list():
event = self.parent.db.find_event_from_id(event_id) event = self.parent.db.find_event_from_id(event_id)
if event.get_name() == "Marriage": if event and event.get_name() == "Marriage":
return event return event
return None return None

12
src/Marriage.py
View File

@ -465,16 +465,18 @@ class Marriage:
self.etree.clear() self.etree.clear()
self.emap = {} self.emap = {}
for event_id in self.elist: for event_id in self.elist:
data = self.db.find_event_from_id(event_id) event = self.db.find_event_from_id(event_id)
place_id = data.get_place_id() if not event:
continue
place_id = event.get_place_id()
if place_id: if place_id:
place_name = self.db.find_place_from_id(place_id).get_title() place_name = self.db.find_place_from_id(place_id).get_title()
else: else:
place_name = "" place_name = ""
iter = self.etree.add([const.display_fevent(data.get_name()), iter = self.etree.add([const.display_fevent(event.get_name()),
data.get_quote_date(),place_name],data) event.get_quote_date(),place_name],event)
self.emap[str(data)] = iter self.emap[str(event)] = iter
if self.elist: if self.elist:
self.etree.select_row(0) self.etree.select_row(0)
Utils.bold_label(self.events_label) Utils.bold_label(self.events_label)