New Citations not included on the Narrative Web

Fixes #13046
gramps-project · Oct 2, 2023 · e359fda · e359fda
1 parent 238d3b3
commit e359fda
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/gramps/plugins/webreport/basepage.py b/gramps/plugins/webreport/basepage.py
@@ -896,7 +896,8 @@ def display_event_row(
 
         trow2 = Html("tr")
         # get event source references
-        srcrefs = self.get_citation_links(event.get_citation_list()) or "&nbsp;"
+        srcrefs = self.get_citation_links(event.get_citation_list() +
+                                          event_ref.get_citation_list()) or "&nbsp;"
         trow += Html("td", srcrefs, class_="ColumnSources", rowspan=2)
 
         # get event notes

diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py
@@ -180,7 +180,7 @@ def __init__(self, database, options, user):
 
         stdoptions.run_private_data_option(self, menu)
         stdoptions.run_living_people_option(self, menu)
-        self.database = CacheProxyDb(self.database)
+        self.database = CacheProxyDb(database)
         self._db = self.database
 
         filters_option = menu.get_option_by_name("filter")
@@ -723,6 +723,8 @@ def _add_person(self, person_handle, bkref_class, bkref_handle):
 
                         for citation_handle in event.get_citation_list():
                             self._add_citation(citation_handle, Person, person_handle)
+                        for citation_handle in evt_ref.get_citation_list():
+                            self._add_citation(citation_handle, Person, person_handle)
 
             ############### Families section ##############
             # Tell the families tab to display this individuals families
@@ -753,6 +755,10 @@ def _add_person(self, person_handle, bkref_class, bkref_handle):
                                         self._add_citation(
                                             cite_hdl, Person, person_handle
                                         )
+                                    for cite_hdl in evt_ref.get_citation_list():
+                                        self._add_citation(
+                                            cite_hdl, Person, person_handle
+                                        )
                                     # add the family media and the family event media if the
                                     # families page is not being displayed (If it is displayed,
                                     # the media are linked from the families page)