projects / odoo / odoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 73a01a1)
[FIX] survey: mess with JS loading
authorRichard Mathot <rim@openerp.com>
Wed, 17 Sep 2014 09:53:14 +0000 (11:53 +0200)
committerRichard Mathot <rim@openerp.com>
Wed, 17 Sep 2014 09:53:14 +0000 (11:53 +0200)
Since yesterday, JS bundles are now loaded at the end of the webpage.
Old-style modules that hardlink js code in the <head> section are now
broken since they use jQuery's $.

addons/survey/views/survey_result.xml patch | blob | history
addons/survey/views/survey_templates.xml patch | blob | history

diff --git a/addons/survey/views/survey_result.xml b/addons/survey/views/survey_result.xml
index 6dae95a..51ff03b 100644 (file)
--- a/addons/survey/views/survey_result.xml
+++ b/addons/survey/views/survey_result.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
+    <template id="assets_frontend_result" inherit_id="website.assets_frontend" name="Survey Results assets">
+        <xpath expr="." position="inside">
+            <script src="/web_graph/static/lib/nvd3/d3.v3.js"></script>
+            <script src="/web_graph/static/lib/nvd3/nv.d3.js"></script>
+            <script type="text/javascript" src="/survey/static/src/js/survey_result.js" />
+            <link href="/web_graph/static/src/css/nv.d3.css" rel="stylesheet" type="text/css"></link>
+            <link href="/survey/static/src/css/survey_result.css" rel="stylesheet" type="text/css"></link>
+        </xpath>
+    </template>
     <template id="result" name="Survey Result">
         <t t-call="website.layout">
-            <t t-set="head">
-                <link href="/web_graph/static/src/css/nv.d3.css" rel="stylesheet" type="text/css"></link>
-                <link href="/survey/static/src/css/survey_result.css" rel="stylesheet" type="text/css"></link>
-                <script src="/web_graph/static/lib/nvd3/d3.v3.js"></script>
-                <script src="/web_graph/static/lib/nvd3/nv.d3.js"></script>
-                <script type="text/javascript" src="/survey/static/src/js/survey_result.js" />
-            </t>
             <div class="oe_structure" />
             <div class="container">
                 <div class="jumbotron mt32">
diff --git a/addons/survey/views/survey_templates.xml b/addons/survey/views/survey_templates.xml
index b49a48d..b46ba9b 100644 (file)
--- a/addons/survey/views/survey_templates.xml
+++ b/addons/survey/views/survey_templates.xml
@@ -82,11 +82,13 @@
     </template>
 
     <!-- A survey -->
+    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Survey assets">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/survey/static/src/js/survey.js" />
+        </xpath>
+    </template>
     <template id="survey" name="Survey">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/survey/static/src/js/survey.js" />
-            </t>
             <div class="wrap">
                 <div class="oe_structure"/>
                 <div class="container">
@@ -260,9 +262,6 @@
     <!-- Printable view of a survey (all pages) -->
     <template id="survey_print" name="Survey">
         <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/survey/static/src/js/survey.js" />
-            </t>
             <div class="wrap">
                 <div class="container">
                     <div class="row">
Unnamed repository; edit this file 'description' to name the repository.