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

* src/DataViews/_RelationView.py: Escape XML special chars

Browse Source 
* src/DataViews/_PedigreeView.py: Escape XML special chars
* src/plugins/TestcaseGenerator.py: Create media note object; Randomize URL



svn: r7787
This commit is contained in:
Martin Hawlisch
2006-12-12 11:49:57 +00:00
parent c72278515b
commit ea86f9870b
4 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/DataViews/_PedigreeView.py
View File

@ -387,14 +387,20 @@ class FormattingHelper:
def format_person( self, person, line_count, use_markup=False):
if not person:
return ""
name = NameDisplay.displayer.display(person)
if use_markup:
name = escape(NameDisplay.displayer.display(person))
else:
name = NameDisplay.displayer.display(person)
if line_count < 3:
return name
birth = ReportUtils.get_birth_or_fallback(self.dbstate.db, person)
if birth and use_markup and birth.get_type() != RelLib.EventType.BIRTH:
bdate = "<i>%s</i>" % DateHandler.get_date(birth)
bplace = "<i>%s</i>" % self.get_place_name(birth.get_place_handle())
bdate = "<i>%s</i>" % escape(DateHandler.get_date(birth))
bplace = "<i>%s</i>" % escape(self.get_place_name(birth.get_place_handle()))
elif birth and use_markup:
bdate = escape(DateHandler.get_date(birth))
bplace = escape(self.get_place_name(birth.get_place_handle()))
elif birth:
bdate = DateHandler.get_date(birth)
bplace = self.get_place_name(birth.get_place_handle())
@ -403,8 +409,11 @@ class FormattingHelper:
bplace = ""
death = ReportUtils.get_death_or_fallback(self.dbstate.db, person)
if death and use_markup and death.get_type() != RelLib.EventType.DEATH:
ddate = "<i>%s</i>" % DateHandler.get_date(death)
dplace = "<i>%s</i>" % self.get_place_name(death.get_place_handle())
ddate = "<i>%s</i>" % escape(DateHandler.get_date(death))
dplace = "<i>%s</i>" % escape(self.get_place_name(death.get_place_handle()))
elif death and use_markup:
ddate = escape(DateHandler.get_date(death))
dplace = escape(self.get_place_name(death.get_place_handle()))
elif death:
ddate = DateHandler.get_date(death)
dplace = self.get_place_name(death.get_place_handle())