Add attribute citations

gramps-project · Oct 2, 2023 · 6a5c1a9 · 6a5c1a9
1 parent e359fda
commit 6a5c1a9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/gramps/plugins/webreport/basepage.py b/gramps/plugins/webreport/basepage.py
@@ -912,13 +912,12 @@ def display_event_row(
         # cached original
         attrlist.extend(event_ref.get_attribute_list())
         for attr in attrlist:
-            htmllist.extend(
-                Html(
-                    "p",
-                    self._("%(str1)s: %(str2)s")
-                    % {"str1": Html("b", attr.get_type()), "str2": attr.get_value()},
-                )
-            )
+            attrrefs = self.get_citation_links(attr.get_citation_list())
+            attrdesc = (self._("%(str1)s: %(str2)s")
+                % {"str1": Html("b", attr.get_type()), "str2": attr.get_value()})
+            attr_row = (Html("tr") + Html("td", "&nbsp")
+                        + Html("td", attrdesc, colspan=3) + Html("td", attrrefs))
+            htmllist.extend(attr_row)
 
             # also output notes attached to the attributes
             notelist = attr.get_note_list()

diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py
@@ -725,6 +725,9 @@ def _add_person(self, person_handle, bkref_class, bkref_handle):
                             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)
+                        for attr in evt_ref.get_attribute_list():
+                            for citation_handle in attr.get_citation_list():
+                                self._add_citation(citation_handle, Event, evt_ref.ref)
 
             ############### Families section ##############
             # Tell the families tab to display this individuals families