Skip to content

Commit c343d44

Browse files
authored
use released version of superdesk and planning (#641)
* use release for superdesk core and planning * update reportlab version * fix print report error * fix failing test
1 parent 92d4acb commit c343d44

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

newsroom/news_api/news/atom/atom.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ def _format_update_date(date):
147147
"assets.get_item",
148148
asset_id=src.get("media"),
149149
_external=True,
150+
_scheme="https",
150151
)
151152
html_updated = True
152153
if html_updated:

newsroom/templates/reports_print.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h2 class="text-center">{{ data.get('name') }}</h2>
1212
<script>
1313
window.newsroom = {{ get_client_config() | tojson | safe }};
1414
reportData = {{ data | tojson | safe }};
15-
report = {{ report | tojson | safe }};
15+
report = "{{ report | tojson | safe }}";
1616
</script>
1717

1818
{{ javascript_tag('%s_js' % setting_type) | safe }}

requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ python3-saml>=1.15,<1.16
1818

1919
# Fix an issue between xhtml2pdf v0.2.4 and reportlab v3.6.7
2020
# https://github.com/xhtml2pdf/xhtml2pdf/issues/589
21-
reportlab==3.6.6
21+
reportlab>=3.6.11,<3.7
2222

23-
superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@develop
24-
superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@develop
23+
superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.7.0-rc1
24+
superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.7.0-rc1

0 commit comments

Comments
 (0)