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
superdesk · Oct 27, 2023 · c343d44 · c343d44
1 parent 92d4acb
commit c343d44
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/newsroom/news_api/news/atom/atom.py b/newsroom/news_api/news/atom/atom.py
@@ -147,6 +147,7 @@ def _format_update_date(date):
                                     "assets.get_item",
                                     asset_id=src.get("media"),
                                     _external=True,
+                                    _scheme="https",
                                 )
                                 html_updated = True
             if html_updated:

diff --git a/newsroom/templates/reports_print.html b/newsroom/templates/reports_print.html
@@ -12,7 +12,7 @@ <h2 class="text-center">{{ data.get('name') }}</h2>
     <script>
         window.newsroom = {{ get_client_config() | tojson | safe }};
         reportData = {{ data | tojson | safe }};
-        report = {{ report | tojson | safe }};
+        report = "{{ report | tojson | safe }}";
     </script>
 
     {{ javascript_tag('%s_js' % setting_type) | safe }}

diff --git a/requirements.txt b/requirements.txt
@@ -18,7 +18,7 @@ python3-saml>=1.15,<1.16
 
 # Fix an issue between xhtml2pdf v0.2.4 and reportlab v3.6.7
 # https://github.com/xhtml2pdf/xhtml2pdf/issues/589
-reportlab==3.6.6
+reportlab>=3.6.11,<3.7
 
-superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@develop
-superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@develop
+superdesk-core @ git+https://github.com/superdesk/superdesk-core.git@v2.7.0-rc1
+superdesk-planning @ git+https://github.com/superdesk/superdesk-planning.git@v2.7.0-rc1