erp5_web: base url does't always start with root url

3005eb49 · Xiaowu Zhang · 0fb3836d · 3005eb49
Commit 3005eb49 authored Jul 15, 2021 by Xiaowu Zhang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py ...tem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py +4 -2

No files found.
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/Base_convertHtmlToSingleFile.py
@@ -252,8 +252,10 @@ else:
  root_url = base_url_root_object.absolute_url()
  base_url = base_url_object.absolute_url()

-assert base_url_object.getRelativeUrl().startswith(base_url_root_object.getRelativeUrl())
-base_path = base_url_object.getRelativeUrl()[len(base_url_root_object.getRelativeUrl()):]
+if base_url_object.getRelativeUrl().startswith(base_url_root_object.getRelativeUrl()):
+  base_path = base_url_object.getRelativeUrl()[len(base_url_root_object.getRelativeUrl()):]
+else:
+  base_path = base_url_object.getRelativeUrl()
 if not base_path.startswith("/"):
  base_path = "/" + base_path