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

Narweb: Private notes for home, intro and contact (#953)

Browse Source 
If the notes are private, we can't use them in these pages.
This commit is contained in:
Serge Noiraud 2020-01-09 19:09:25 +01:00 committed by Paul Culley
parent d693881b98
commit 06cb9d7ea6
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gramps/plugins/webreport/contact.py
View File

@ -126,10 +126,11 @@ class ContactPage(BasePage):
note_id = report.options['contactnote'] note_id = report.options['contactnote']
if note_id: if note_id:
note = self.r_db.get_note_from_gramps_id(note_id) note = self.r_db.get_note_from_gramps_id(note_id)
note_text = self.get_note_format(note, False) if note:
note_text = self.get_note_format(note, False)
# attach note # attach note
summaryarea += note_text summaryarea += note_text
# add clearline for proper styling # add clearline for proper styling
# add footer section # add footer section

12
gramps/plugins/webreport/home.py
View File

@ -87,15 +87,17 @@ class HomePage(BasePage):
section += homeimg section += homeimg
note_id = report.options['homenote'] note_id = report.options['homenote']
ldatec = None
if note_id: if note_id:
note = self.r_db.get_note_from_gramps_id(note_id) note = self.r_db.get_note_from_gramps_id(note_id)
note_text = self.get_note_format(note, False) if note:
note_text = self.get_note_format(note, False)
# attach note # attach note
section += note_text section += note_text
# last modification of this note # last modification of this note
ldatec = note.get_change_time() ldatec = note.get_change_time()
# create clear line for proper styling # create clear line for proper styling
# create footer section # create footer section

12
gramps/plugins/webreport/introduction.py
View File

@ -87,15 +87,17 @@ class IntroductionPage(BasePage):
section += introimg section += introimg
note_id = report.options['intronote'] note_id = report.options['intronote']
ldatec = None
if note_id: if note_id:
note = self.r_db.get_note_from_gramps_id(note_id) note = self.r_db.get_note_from_gramps_id(note_id)
note_text = self.get_note_format(note, False) if note:
note_text = self.get_note_format(note, False)
# attach note # attach note
section += note_text section += note_text
# last modification of this note # last modification of this note
ldatec = note.get_change_time() ldatec = note.get_change_time()
# add clearline for proper styling # add clearline for proper styling
# create footer section # create footer section

2
gramps/plugins/webreport/narrativeweb.py
View File

@ -1453,7 +1453,7 @@ class NavWebReport(Report):
output_file.close() output_file.close()
else: else:
output_file.close() output_file.close()
if date > 0: if date is not None and date > 0:
os.utime(output_file.name, (date, date)) os.utime(output_file.name, (date, date))
def prepare_copy_media(self, photo): def prepare_copy_media(self, photo):