Merge branch 'master' into Develop

2021-10-24 09:49:42 +02:00
parent 917909cfdb aefed40a2f
commit bb20979c71
87 changed files with 16529 additions and 12200 deletions
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@@ -199,6 +199,8 @@
                  {{column.value|safe}}
                {% elif c.datatype == 'series' %}
                  {{ '%s [%s]' % (column.value, column.extra|formatfloat(2)) }}
+                {% elif c.datatype == 'text' %}
+                    {{ column.value.strip() }}{% if not loop.last %}, {% endif %}
                {% else %}
                  {{ column.value }}
                {% endif %}