From e79dcdaf7a9806ec695690ce790adac47837cc92 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Fri, 16 Jun 2017 09:14:14 +0000 Subject: [PATCH] [erp5_officejs_appstore_base] Keep the url hash while redirecting to the latest version --- .../gadget_ojs_appstore_redirect_page_html.html | 2 +- .../gadget_ojs_appstore_redirect_page_html.xml | 4 ++-- .../WebSection_renderOfficeJSRedirectAppCache.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bt5/erp5_officejs_appstore_base/PathTemplateItem/web_page_module/gadget_ojs_appstore_redirect_page_html.html b/bt5/erp5_officejs_appstore_base/PathTemplateItem/web_page_module/gadget_ojs_appstore_redirect_page_html.html index 688d863b87..20d830f280 100644 --- a/bt5/erp5_officejs_appstore_base/PathTemplateItem/web_page_module/gadget_ojs_appstore_redirect_page_html.html +++ b/bt5/erp5_officejs_appstore_base/PathTemplateItem/web_page_module/gadget_ojs_appstore_redirect_page_html.html @@ -3,7 +3,7 @@ <body> <script language="JavaScript"> function redirect_version() { - document.location.replace("${latest_version}/") + document.location.replace("${latest_version}/" + document.location.hash) }; window.applicationCache.addEventListener('cached',redirect_version); window.applicationCache.addEventListener('noupdate',redirect_version); diff --git a/bt5/erp5_officejs_appstore_base/PathTemplateItem/web_page_module/gadget_ojs_appstore_redirect_page_html.xml b/bt5/erp5_officejs_appstore_base/PathTemplateItem/web_page_module/gadget_ojs_appstore_redirect_page_html.xml index 512f891264..69ea266d1b 100644 --- a/bt5/erp5_officejs_appstore_base/PathTemplateItem/web_page_module/gadget_ojs_appstore_redirect_page_html.xml +++ b/bt5/erp5_officejs_appstore_base/PathTemplateItem/web_page_module/gadget_ojs_appstore_redirect_page_html.xml @@ -242,7 +242,7 @@ </item> <item> <key> <string>serial</string> </key> - <value> <string>959.46591.59882.45141</string> </value> + <value> <string>959.46608.34939.31368</string> </value> </item> <item> <key> <string>state</string> </key> @@ -260,7 +260,7 @@ </tuple> <state> <tuple> - <float>1496147551.92</float> + <float>1497604340.46</float> <string>UTC</string> </tuple> </state> diff --git a/bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/WebSection_renderOfficeJSRedirectAppCache.py b/bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/WebSection_renderOfficeJSRedirectAppCache.py index a4157e61bb..247ed7ca3a 100644 --- a/bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/WebSection_renderOfficeJSRedirectAppCache.py +++ b/bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/WebSection_renderOfficeJSRedirectAppCache.py @@ -13,4 +13,4 @@ response.setHeader('Content-Type', 'text/cache-manifest') response.setHeader('Cache-Control', 'max-age=0, public, must-revalidate') return """CACHE MANIFEST -# %s""" % context.getLayoutProperty("configuration_latest_version", default="development") +# %s + hash""" % context.getLayoutProperty("configuration_latest_version", default="development") -- 2.30.9