From 08862b0f5fd5d76269695223162a3222d4671143 Mon Sep 17 00:00:00 2001
From: Vincent Bechu <vincent.bechu@nexedi.com>
Date: Fri, 19 May 2017 12:55:29 +0000
Subject: [PATCH] erp5_officejs: do not use base in officejs
---
.../portal_skins/erp5_web_officejs_ui/File_viewAsWeb.py | 4 ++++
.../portal_skins/erp5_web_officejs_ui/Image_viewAsWeb.py | 3 +++
.../portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.py | 3 +++
3 files changed, 10 insertions(+)
diff --git a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/File_viewAsWeb.py b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/File_viewAsWeb.py
index ad2b98477d..f09ef4be65 100644
--- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/File_viewAsWeb.py
+++ b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/File_viewAsWeb.py
@@ -2,6 +2,10 @@ if REQUEST is None:
REQUEST = context.REQUEST
if response is None:
response = REQUEST.RESPONSE
+
+# The vanilla HTML is wanted
+response.setBase(None)
+
file = context
file_content = file.getData()
diff --git a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/Image_viewAsWeb.py b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/Image_viewAsWeb.py
index 5677e43cef..414b379044 100644
--- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/Image_viewAsWeb.py
+++ b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/Image_viewAsWeb.py
@@ -3,6 +3,9 @@ if REQUEST is None:
if response is None:
response = REQUEST.RESPONSE
+# The vanilla HTML is wanted
+response.setBase(None)
+
image = context
if REQUEST.getHeader('If-Modified-Since', '') == image.getModificationDate().rfc822():
response.setStatus(304)
diff --git a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.py b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.py
index d74985e21e..3baba62935 100644
--- a/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.py
+++ b/bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/WebPage_viewAsWeb.py
@@ -3,6 +3,9 @@ if REQUEST is None:
if response is None:
response = REQUEST.RESPONSE
+# The vanilla HTML is wanted
+response.setBase(None)
+
web_page = context
web_section = REQUEST.get("current_web_section")
--
2.30.9