From 17c5468a7d4748cb2575a4800bac4b32f383ebe8 2020-06-12 20:42:54 From: Brett Smith Date: 2020-06-12 20:42:54 Subject: [PATCH] reports: ODS links default to using URL as link text. --- diff --git a/conservancy_beancount/reports/core.py b/conservancy_beancount/reports/core.py index b9c7b1f95e6746530137f8de65e4740e9f9f5689..e9fc923b482d50fb9e0bbf506f5736c356aa9cc5 100644 --- a/conservancy_beancount/reports/core.py +++ b/conservancy_beancount/reports/core.py @@ -928,7 +928,7 @@ class BaseODS(BaseSpreadsheet[RT, ST], metaclass=abc.ABCMeta): text = None cell.addElement(odf.text.P()) cell.lastChild.addElement(odf.text.A( - type='simple', href=href, text=text, + type='simple', href=href, text=text or href, )) return cell diff --git a/tests/test_reports_spreadsheet.py b/tests/test_reports_spreadsheet.py index f56016702fbcf092169d97d96694cec718e31845..fb697555d1ec6d394f37c19625e2567497a1ac83 100644 --- a/tests/test_reports_spreadsheet.py +++ b/tests/test_reports_spreadsheet.py @@ -514,7 +514,7 @@ def test_ods_writer_multilink_singleton(ods_writer, cell_source, style_name): href = cell_source text = None anchor = get_child(cell, odf.text.A, type='simple', href=href) - assert get_text(anchor) == (text or '') + assert get_text(anchor) == (text or href) def test_ods_writer_multilink_cell(ods_writer): cell = ods_writer.multilink_cell(iter(LINK_CELL_DATA)) @@ -528,7 +528,7 @@ def test_ods_writer_multilink_cell(ods_writer): text = None assert child.getAttribute('type') == 'simple' assert child.getAttribute('href') == href - assert get_text(child) == (text or '') + assert get_text(child) == (text or href) @pytest.mark.parametrize('cell_source,style_name', testutil.combine_values( STRING_CELL_DATA,