Cleanup and add conformity to dump_residence().

svn: r15523
This commit is contained in:
Rob G. Healey 2010-06-04 02:56:14 +00:00
parent 4b57c7c3be
commit fcf02507b5

View File

@ -1878,7 +1878,6 @@ class BasePage(object):
if not has_res: if not has_res:
return None return None
db = self.report.database
# begin residence division # begin residence division
with Html("div", id = "Residence", class_ = "content") as residence: with Html("div", id = "Residence", class_ = "content") as residence:
@ -1889,20 +1888,20 @@ class BasePage(object):
place_handle = has_res.get_place_handle() place_handle = has_res.get_place_handle()
if place_handle: if place_handle:
place = db.get_place_from_handle(place_handle) place = self.report.database.get_place_from_handle(place_handle)
if place: if place:
self.dump_place(place, table) self.dump_place(place, table)
descr = has_res.get_description() descr = has_res.get_description()
if descr: if descr:
with Html("table", class_ = "infolist") as table:
residence += table
trow = Html("tr") + ( trow = Html("tr")
Html("td", DESCRHEAD, class_ = "ColumnAttribute", inline = True), table += trow
Html("td", descr, class_ = "ColumnValue")
) trow.extend(
table += trow ( Html("td", DESCRHEAD, class_ = "ColumnAttribute", inline = True) +
Html("td", descr, class_ = "ColumnValue") )
)
# return information to its callers # return information to its callers
return residence return residence