Skip to content

erp5
erp5
Commit f6a64627 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

erp5_officejs: make graph rendering working inside iframes 

Charting libraries are better within iframe to avoid enabling too permissive
Content Security Policy globally
parent 0d6e9174
Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 7 deletions
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_interface_widget_graph_html.html
View file @ f6a64627
......@@ -37,7 +37,7 @@
"description": "label to display on axis n",
"type": "string"
},
"type": {
"scale_type": {
"description": "type of axis",
"enum": [
"linear",
......@@ -46,6 +46,16 @@
"default": "linear",
"type": "string"
}, },
"value_type": {
"description": "value type for data on this axis",
"enum": [
"number",
"date",
"string"
],
"default": "number",
"type": "string"
}, },
"position": {
"description": "where to place the axis, only y axis for now",
"enum": [
......@@ -138,9 +148,9 @@
axis_mapping_id_dict: {"1": "1_2"}
}
],
layout: {axis_dict : {"0": {"title": "x axis label", "type": "linear"},
"1_0": {"title": "y axis label for first data set", "type": "log", "side" : "left"},
"1_1": {"title": "y axis label for second data set", "position": "right"}
layout: {axis_dict : {"0": {"title": "x axis label", "scale_type": "linear", "value_type": "number"},
"1_1": {"title": "y axis label for first data set", "scale_type": "log", "side" : "left"},
"1_2": {"title": "y axis label for second data set", "position": "right"}
},
title: "Title for my global graph"}
});
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_widget_graph_dygraph_js.js
View file @ f6a64627
......@@ -38,7 +38,7 @@
}
label_list.push(x_label);
/* Dygraph only support 2D, se we assume we have only only two axis for data.
/* Dygraph only support 2D, so we assume we have only only two axis for data.
Then for now we only support series having same x, it can be enhanced later.*/
......@@ -79,7 +79,8 @@
if (dygraph_data.length === 0) {
// Initialize x axis
for (j = 0; j < trace_value_dict[0].length; j = j + 1) {
dygraph_data[j] = [trace_value_dict[0][j]];
// When used within iframe, we have to recreate date object since the date is now string
dygraph_data[j] = [new Date(trace_value_dict[0][j])];
}
}
type = trace.type || 'line';
......@@ -153,7 +154,6 @@
gadget.property_dict.graph = new Dygraph(container,
graph_data_and_parameter.dygraph_data,
graph_data_and_parameter.dygraph_parameter_dict);
})
.declareMethod('updateConfiguration', function (configuration_dict) {
var gadget = this,
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_site_module/renderjs_runner/unsafe.xml 0 → 100644
View file @ f6a64627
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Section" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>__before_publishing_traverse__</string> </key>
<value>
<object>
<klass>
<global name="MultiHook" module="ZPublisher.BeforeTraverse"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_defined_in_class</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>_hookname</string> </key>
<value> <string>__before_publishing_traverse__</string> </value>
</item>
<item>
<key> <string>_list</string> </key>
<value>
<list>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</list>
</value>
</item>
<item>
<key> <string>_prior</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>__before_traverse__</string> </key>
<value>
<dictionary>
<item>
<key>
<tuple>
<int>99</int>
<string>ERP5 Web Section/unsafe</string>
</tuple>
</key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_content_security_policy</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_x_frame_options</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>configuration_content_security_policy</string> </key>
<value> <string>default-src \'self\' data: blob: ; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'</string> </value>
</item>
<item>
<key> <string>configuration_x_frame_options</string> </key>
<value> <string>SAMEORIGIN</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>empty_criterion_valid</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>unsafe</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Section</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Unsafe</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="WebSectionTraversalHook" module="Products.ERP5.Document.WebSection"/>
</pickle>
<pickle>
<dictionary/>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7