[erp5_web_renderjs_ui] Allow to not use a cache manifest

692e466e · Romain Courteaud · 12ef5b29 · 692e466e · 692e466e · 692e466e
Commit 692e466e authored Apr 13, 2017 by Romain Courteaud
4 changed files
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.html
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.html
 <!DOCTYPE html>
-<html manifest="${manifest_url}">
+<html ${manifest_attribute}>
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">

--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_html.xml
@@ -236,7 +236,7 @@
            </item>
            <item>
                <key> <string>serial</string> </key>
-                <value> <string>958.33121.48203.5614</string> </value>
+                <value> <string>958.43001.15704.45499</string> </value>
            </item>
            <item>
                <key> <string>state</string> </key>
@@ -254,7 +254,7 @@
                    </tuple>
                    <state>
                      <tuple>
-                        <float>1491989001.6</float>
+                        <float>1492085733.75</float>
                        <string>UTC</string>
                      </tuple>
                    </state>

--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_site_module/renderjs_runner.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_site_module/renderjs_runner.xml
@@ -269,6 +269,16 @@
                      <value> <string>string</string> </value>
                  </item>
                </dictionary>
+                <dictionary>
+                  <item>
+                      <key> <string>id</string> </key>
+                      <value> <string>configuration_manifest_url</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>type</string> </key>
+                      <value> <string>string</string> </value>
+                  </item>
+                </dictionary>
              </tuple>
            </value>
        </item>
@@ -341,6 +351,10 @@
            <key> <string>configuration_jio_gadget_url</string> </key>
            <value> <string>gadget_erp5_jio.html</string> </value>
        </item>
+        <item>
+            <key> <string>configuration_manifest_url</string> </key>
+            <value> <string>gadget_erp5.appcache</string> </value>
+        </item>
        <item>
            <key> <string>configuration_panel_gadget_url</string> </key>
            <value> <string>gadget_erp5_panel.html</string> </value>
@@ -586,7 +600,7 @@
            </item>
            <item>
                <key> <string>serial</string> </key>
-                <value> <string>956.14341.54322.61030</string> </value>
+                <value> <string>958.41530.20774.12100</string> </value>
            </item>
            <item>
                <key> <string>state</string> </key>
@@ -604,7 +618,7 @@
                    </tuple>
                    <state>
                      <tuple>
-                        <float>1482764019.59</float>
+                        <float>1492085998.14</float>
                        <string>UTC</string>
                      </tuple>
                    </state>

--- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/WebSection_renderDefaultPageAsGadget.py
+++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/WebSection_renderDefaultPageAsGadget.py
@@ -30,7 +30,8 @@ view_as_web_method = default_web_page.getTypeBasedMethod(
  "viewAsWeb",
  fallback_script_id="WebPage_viewAsWeb"
  )
-return view_as_web_method(mapping_dict={
+
+mapping_dict = {
  "frontpage_gadget": web_section.getLayoutProperty("configuration_frontpage_gadget_url", default="worklist"),
  "jio_document_page_gadget": web_section.getLayoutProperty("configuration_default_jio_document_page_gadget_url", default="form"),
  "application_title": web_section.getLayoutProperty("configuration_application_title", default="ERP5"),
@@ -48,4 +49,12 @@ return view_as_web_method(mapping_dict={
  "website_url_set": json.dumps(website_url_set),
  "site_description": web_section.getLayoutProperty("description", default=""),
  "site_keywords": web_section.getLayoutProperty("subject", default=""),
-})
+}
+
+configuration_manifest_url = web_section.getLayoutProperty("configuration_manifest_url", default=None)
+if configuration_manifest_url is None:
+  mapping_dict["manifest_attribute"] = ''
+else:
+  mapping_dict["manifest_attribute"] = 'manifest="%s"' % configuration_manifest_url
+
+return view_as_web_method(mapping_dict=mapping_dict)