NPO-Accounting/conservancy_beancount
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accrual: Outgoing report doesn't put RT web links in < >.

Browse source 
The RT web interface doesn't handle angle brackets well, making the
`>` part of the link.
This commit is contained in:
Brett Smith 2020-05-18 17:04:28 -04:00
parent b142e8fc31
commit 47235f694c
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conservancy_beancount/reports/accrual.py
View file

@ -230,7 +230,7 @@ def outgoing_report(groups: PostGroups,
contract_links = related.all_meta_links('contract') contract_links = related.all_meta_links('contract')
if contract_links: if contract_links:
contract_s = ' , '.join(rt_wrapper.iter_urls( contract_s = ' , '.join(rt_wrapper.iter_urls(
contract_links, '<{}>', '{}', '<BROKEN RT LINK: {}>', contract_links, missing_fmt='<BROKEN RT LINK: {}>',
)) ))
else: else:
contract_s = "NO CONTRACT GOVERNS THIS TRANSACTION" contract_s = "NO CONTRACT GOVERNS THIS TRANSACTION"
@ -254,7 +254,7 @@ def outgoing_report(groups: PostGroups,
txn = post.meta.txn txn = post.meta.txn
if txn is not last_txn: if txn is not last_txn:
last_txn = txn last_txn = txn
txn = rt_wrapper.txn_with_urls(txn) txn = rt_wrapper.txn_with_urls(txn, '{}')
bc_printer.print_entry(txn, file=out_file) bc_printer.print_entry(txn, file=out_file)
def filter_search(postings: Iterable[data.Posting], def filter_search(postings: Iterable[data.Posting],

2
setup.py
View file

@ -5,7 +5,7 @@ from setuptools import setup
setup( setup(
name='conservancy_beancount', name='conservancy_beancount',
description="Plugin, library, and reports for reading Conservancy's books", description="Plugin, library, and reports for reading Conservancy's books",
version='1.0.4', version='1.0.5',
author='Software Freedom Conservancy', author='Software Freedom Conservancy',
author_email='info@sfconservancy.org', author_email='info@sfconservancy.org',
license='GNU AGPLv3+', license='GNU AGPLv3+',

8
tests/test_reports_accrual.py
View file

@ -305,8 +305,9 @@ def test_outgoing_report(accrual_postings):
accrual.outgoing_report({invoice: related}, output, errors, rt_client, rt_cache) accrual.outgoing_report({invoice: related}, output, errors, rt_client, rt_cache)
assert not errors.getvalue() assert not errors.getvalue()
rt_url = rt_client.DEFAULT_URL[:-9] rt_url = rt_client.DEFAULT_URL[:-9]
rt_id_url = re.escape(f'<{rt_url}Ticket/Display.html?id=510>') rt_id_url = rf'\b{re.escape(f"{rt_url}Ticket/Display.html?id=510")}\b'
contract_url = re.escape(f'<{rt_url}Ticket/Attachment/4000/4000/contract.pdf>') contract_url = rf'\b{re.escape(f"{rt_url}Ticket/Attachment/4000/4000/contract.pdf")}\b'
print(output.getvalue())
check_output(output, [ check_output(output, [
r'^PAYMENT FOR APPROVAL:$', r'^PAYMENT FOR APPROVAL:$',
r'^REQUESTOR: Mx\. 510 <mx510@example\.org>$', r'^REQUESTOR: Mx\. 510 <mx510@example\.org>$',
@ -338,9 +339,6 @@ def test_outgoing_report_custom_field_fallbacks(accrual_postings):
rt_cache = rtutil.RT(rt_client) rt_cache = rtutil.RT(rt_client)
accrual.outgoing_report({invoice: related}, output, errors, rt_client, rt_cache) accrual.outgoing_report({invoice: related}, output, errors, rt_client, rt_cache)
assert not errors.getvalue() assert not errors.getvalue()
rt_url = rt_client.DEFAULT_URL[:-9]
rt_id_url = re.escape(f'<{rt_url}Ticket/Display.html?id=510>')
contract_url = re.escape(f'<{rt_url}Ticket/Attachment/4000/4000/contract.pdf>')
check_output(output, [ check_output(output, [
r'^PAYMENT FOR APPROVAL:$', r'^PAYMENT FOR APPROVAL:$',
r'^REQUESTOR: <mx510@example\.org>$', r'^REQUESTOR: <mx510@example\.org>$',