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

Replace "get_note()" calls with "get_note_list()"

Browse Source 
svn: r8747
This commit is contained in:
Brian Matherly 2007-07-20 12:03:35 +00:00
parent 8e315b4579
commit 50fe8cb60b
5 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-07-20 Brian Matherly <brian@gramps-project.org>
* src/ToolTips.py (RepositoryTip:get_tip):
* src/plugins/WriteGeneWeb.py (write_family, write_note_of_person):
* src/plugins/FamilyGroup.py (dump_parent):
* src/plugins/NarrativeWeb.py (display_footer, display_header):
Replace "get_note()" calls with "get_note_list()"
2007-07-19 Brian Matherly <brian@gramps-project.org>
* src/plugins/DetDescendantReport.py:
Need to include attributes in Detailed Descendant report (#0001021)

11
src/ToolTips.py
View File

@ -137,7 +137,6 @@ class RepositoryTip:
"\t<b>%s:</b>\t%s\n"\
"\t<b>%s:</b>\t%s\n"\
"\t<b>%s:</b>\t%s\n"\
"\t<b>%s:</b>\t%s\n"\
% (
_("Repository"),escape(self._obj.get_name()),
_("Location"),
@ -150,8 +149,14 @@ class RepositoryTip:
_("Telephone"), escape(self._obj.address.get_phone()),
_("Email"), escape(self._obj.get_email()),
_("Search Url"), escape(self._obj.get_search_url()),
_("Home Url"), escape(self._obj.get_home_url()),
_("Note"), escape(self._obj.get_note()))
_("Home Url"), escape(self._obj.get_home_url()))
# Get the notes
notelist = self._obj.get_note_list()
for notehandle in notelist:
note = self._db.get_note_from_handle(notehandle)
s += "\t<b>%s:</b>\t%s\n" % (
_("Note"), escape(note.get(False)))
# Get the list of sources that reference this repository
repos_handle = self._obj.get_handle()

6
src/plugins/FamilyGroup.py
View File

@ -297,8 +297,10 @@ class FamilyGroup(Report):
self.doc.end_cell()
self.doc.end_row()
if self.incParNotes and (person.get_note() != ""):
self.dump_parent_line(_("Notes"),person.get_note())
if self.incParNotes:
for notehandle in person.get_note_list():
note = self.database.get_note_from_handle(notehandle)
self.dump_parent_line(_("Note"),note.get(False))
if self.incParNames:
for alt_name in person.get_alternate_names():

18
src/plugins/NarrativeWeb.py
View File

@ -282,9 +282,12 @@ class BasePage:
if self.footer:
obj = db.get_object_from_handle(self.footer)
if obj:
of.write('<div class="user_footer">\n')
of.write(obj.get_note(markup=True))
of.write('</div>\n')
notelist = obj.get_note_list()
if notelist:
note = db.get_note_from_handle(notelist[0])
of.write('<div class="user_footer">\n')
of.write(note.get(markup=True))
of.write('</div>\n')
of.write('</body>\n')
of.write('</html>\n')
@ -317,9 +320,12 @@ class BasePage:
if self.header:
obj = db.get_object_from_handle(self.header)
if obj:
of.write(' <div class="user_header">\n')
of.write(obj.get_note(markup=True))
of.write(' </div>\n')
notelist = obj.get_note_list()
if notelist:
note = db.get_note_from_handle(notelist[0])
of.write(' <div class="user_header">\n')
of.write(note.get(markup=True))
of.write(' </div>\n')
of.write('<div id="navheader">\n')
value = unicode(time.strftime('%x',time.localtime(time.time())),

16
src/plugins/WriteGeneWeb.py
View File

@ -290,7 +290,12 @@ class GeneWebWriter:
self.write_children( family, father)
self.write_notes( family, father, mother)
if not (self.restrict and self.exclnotes):
note = family.get_note()
notelist = family.get_note_list()
note = ""
for notehandle in notelist:
noteobj = self.db.get_note_from_handle(notehandle)
note += noteobj.get(False)
note += " "
if note and note != "":
note = note.replace('\n\r',' ')
note = note.replace('\r\n',' ')
@ -378,7 +383,14 @@ class GeneWebWriter:
def write_note_of_person(self,person):
if self.persons_notes_done.count(person.get_handle()) == 0:
self.persons_notes_done.append(person.get_handle())
note = person.get_note()
notelist = person.get_note_list()
note = ""
for notehandle in notelist:
noteobj = self.db.get_note_from_handle(notehandle)
note += noteobj.get(False)
note += " "
if note and note != "":
self.writeln("")
self.writeln("notes %s" % self.get_ref_name(person))