changeset 779b09ee5fb9 in trytond:default
details: https://hg.tryton.org/trytond?cmd=changeset;node=779b09ee5fb9
description:
Add summary to line list
A function field summary is added which takes the first line of
description
field. This is useful to identify line without product (only with
description)
in the list.
issue9695
review292431002
diffstat:
CHANGELOG | 1 +
doc/ref/tools/misc.rst | 4 ++++
trytond/ir/attachment.py | 8 +-------
trytond/tests/test_tools.py | 14 +++++++++++++-
trytond/tools/__init__.py | 4 ++--
trytond/tools/misc.py | 8 ++++++++
6 files changed, 29 insertions(+), 10 deletions(-)
diffs (109 lines):
diff -r 0560b0a2bd50 -r 779b09ee5fb9 CHANGELOG
--- a/CHANGELOG Tue Dec 22 00:27:17 2020 +0100
+++ b/CHANGELOG Fri Dec 25 17:14:57 2020 +0100
@@ -1,3 +1,4 @@
+* Add firstline tool
* Add support for Python 3.9
* Skip access check on ModelStorage instances
* Eager load Function field with same multiple getter
diff -r 0560b0a2bd50 -r 779b09ee5fb9 doc/ref/tools/misc.rst
--- a/doc/ref/tools/misc.rst Tue Dec 22 00:27:17 2020 +0100
+++ b/doc/ref/tools/misc.rst Fri Dec 25 17:14:57 2020 +0100
@@ -12,3 +12,7 @@
.. method:: sql_pairing(x, y)
Return an SQL expression that pairs SQL integers x and y.
+
+.. method:: firstline(text)
+
+Return first non-empty line of a text field.
diff -r 0560b0a2bd50 -r 779b09ee5fb9 trytond/ir/attachment.py
--- a/trytond/ir/attachment.py Tue Dec 22 00:27:17 2020 +0100
+++ b/trytond/ir/attachment.py Fri Dec 25 17:14:57 2020 +0100
@@ -7,19 +7,13 @@
from trytond.i18n import lazy_gettext
from trytond.model import ModelView, ModelSQL, fields
from trytond.pyson import Eval
+from trytond.tools import firstline
from trytond.transaction import Transaction
from .resource import ResourceMixin, resource_copy
__all__ = ['AttachmentCopyMixin']
-def firstline(description):
- try:
- return next((x for x in description.splitlines() if x.strip()))
- except StopIteration:
- return ''
-
-
if config.getboolean('attachment', 'filestore', default=True):
file_id = 'file_id'
store_prefix = config.get('attachment', 'store_prefix', default=None)
diff -r 0560b0a2bd50 -r 779b09ee5fb9 trytond/tests/test_tools.py
--- a/trytond/tests/test_tools.py Tue Dec 22 00:27:17 2020 +0100
+++ b/trytond/tests/test_tools.py Fri Dec 25 17:14:57 2020 +0100
@@ -13,7 +13,7 @@
from trytond.tools import (
reduce_ids, reduce_domain, decimal_, is_instance_method, file_open,
strip_wildcard, lstrip_wildcard, rstrip_wildcard, slugify, sortable_values,
- escape_wildcard)
+ escape_wildcard, firstline)
from trytond.tools.string_ import StringPartitioned, LazyString
from trytond.tools.domain_inversion import (
domain_inversion, parse, simplify, merge, concat, unique_value,
@@ -757,6 +757,18 @@
(('a', 1), ('b', None)),
])
+ def test_firstline(self):
+ "Test firstline"
+ for text, result in [
+ ("", ""),
+ ("first line\nsecond line", "first line"),
+ ("\nsecond line", "second line"),
+ ("\n\nthird line", "third line"),
+ (" \nsecond line", "second line"),
+ ]:
+ with self.subTest(text=text, result=result):
+ self.assertEqual(firstline(text), result)
+
def suite():
func = unittest.TestLoader().loadTestsFromTestCase
diff -r 0560b0a2bd50 -r 779b09ee5fb9 trytond/tools/__init__.py
--- a/trytond/tools/__init__.py Tue Dec 22 00:27:17 2020 +0100
+++ b/trytond/tools/__init__.py Fri Dec 25 17:14:57 2020 +0100
@@ -9,14 +9,14 @@
file_open, get_smtp_server, reduce_ids, reduce_domain,
grouped_slice, is_instance_method, resolve, strip_wildcard,
lstrip_wildcard, rstrip_wildcard, slugify, sortable_values,
- escape_wildcard, sql_pairing)
+ escape_wildcard, sql_pairing, firstline)
from .decimal_ import decistmt
__all__ = ['file_open', 'get_smtp_server', 'reduce_ids',
'reduce_domain', 'grouped_slice', 'is_instance_method', 'resolve',
'strip_wildcard', 'lstrip_wildcard', 'rstrip_wildcard', 'slugify',
'decistmt', 'ClassProperty', 'cursor_dict', 'cached_property',
- 'sortable_values', 'escape_wildcard', 'sql_pairing']
+ 'sortable_values', 'escape_wildcard', 'sql_pairing', 'firstline']
class ClassProperty(property):
diff -r 0560b0a2bd50 -r 779b09ee5fb9 trytond/tools/misc.py
--- a/trytond/tools/misc.py Tue Dec 22 00:27:17 2020 +0100
+++ b/trytond/tools/misc.py Fri Dec 25 17:14:57 2020 +0100
@@ -250,3 +250,11 @@
return Case(
(x < y, (y * y) + x),
else_=(x * x) + x + y)
+
+
+def firstline(text):
+ "Returns first non-empty line"
+ try:
+ return next((x for x in text.splitlines() if x.strip()))
+ except StopIteration:
+ return ''