Skip to content

erp5-Boxiang
erp5-Boxiang
Commit 895cf757 authored by Hamza's avatar Hamza
Browse files
Options

change officeJs_notebook to use "gadget_jsmd_eval.js" instead of "iodide_master.js"

parent d5c716eb
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 20 deletions
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js
View file @ 895cf757
......@@ -55,6 +55,7 @@
return gadget.changeState({
jio_key: options.jio_key,
editable: options.editable || false,///P
doc: result,
child_gadget_url: child_gadget_url
});
......@@ -68,7 +69,8 @@
.push(function (child_gadget) {
return child_gadget.render({
jio_key: gadget.state.jio_key,
doc: gadget.state.doc
doc: gadget.state.doc,
editable: gadget.state.editable///P
});
});
}
......@@ -83,7 +85,8 @@
.push(function (form_gadget) {
return form_gadget.render({
jio_key: gadget.state.jio_key,
doc: gadget.state.doc
doc: gadget.state.doc,
editable: gadget.state.editable///P
});
});
});
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml
View file @ 895cf757
......@@ -225,7 +225,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>967.6016.61211.59613</string> </value>
<value> <string>976.55509.35519.64085</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -243,7 +243,7 @@
</tuple>
<state>
<tuple>
<float>1524754712.51</float>
<float>1562233965.75</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_notebook_view.js.js
View file @ 895cf757
......@@ -21,7 +21,8 @@
.declareMethod("render", function (options) {
return this.changeState({
jio_key: options.jio_key,
doc: options.doc
doc: options.doc,
editable: options.editable
});
})
......@@ -59,7 +60,7 @@
"default": gadget.state.doc.title,
"css_class": "",
"required": 1,
"editable": 1,
"editable": gadget.state.editable,
"key": "title",
"hidden": 0,
"type": "StringField"
......@@ -70,7 +71,7 @@
"default": gadget.state.doc.reference,
"css_class": "",
"required": 0,
"editable": 1,
"editable": gadget.state.editable,
"key": "reference",
"hidden": 0,
"type": "StringField"
......@@ -81,7 +82,7 @@
"default": gadget.state.doc.version,
"css_class": "",
"required": 0,
"editable": 1,
"editable": gadget.state.editable,
"key": "version",
"hidden": 0,
"type": "StringField"
......@@ -92,7 +93,7 @@
"default": gadget.state.doc.language,
"css_class": "",
"required": 0,
"editable": 1,
"editable": gadget.state.editable,
"key": "language",
"hidden": 0,
"type": "StringField"
......@@ -103,7 +104,7 @@
"default": gadget.state.doc.description,
"css_class": "",
"required": 0,
"editable": 1,
"editable": gadget.state.editable,
"key": "description",
"hidden": 0,
"type": "TextAreaField"
......@@ -112,13 +113,13 @@
"default": gadget.state.doc.text_content,
"css_class": "",
"required": 0,
"editable": 1,
"editable": gadget.state.editable,
"key": "text_content",
"hidden": 0,
"type": "GadgetField",
"url": "gadget_editor.html",
"sandbox": "public",
"renderjs_extra": '{"editor": "notebook_editor", "maximize": true}'
"renderjs_extra": '{"editor": "jsmd_editor", "maximize": true}'
}
}},
"_links": {
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_notebook_view.js.xml
View file @ 895cf757
......@@ -244,7 +244,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>970.42986.60138.7065</string> </value>
<value> <string>976.55505.44626.63829</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>1538406432.04</float>
<float>1562232362.28</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_gadget_erp5_page_ojs_download_js.js
View file @ 895cf757
......@@ -39,7 +39,8 @@
return gadget.redirect({
'command': 'display',
'options': {
'jio_key': options.jio_key
'jio_key': options.jio_key,
'editable': options.editable
}
});
});
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/ojs_gadget_erp5_page_ojs_download_js.xml
View file @ 895cf757
......@@ -242,7 +242,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>970.45827.27759.62020</string> </value>
<value> <string>976.55519.44181.17134</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>1539074452.96</float>
<float>1562234054.18</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs/PathTemplateItem/web_site_module/officejs_notebook/app.xml
View file @ 895cf757
......@@ -358,7 +358,7 @@
</item>
<item>
<key> <string>configuration_panel_gadget_url</string> </key>
<value> <string>gadget_erp5_ojs_panel.html</string> </value>
<value> <string>gadget_erp5_ojs_editable_panel.html</string> </value>
</item>
<item>
<key> <string>configuration_router_gadget_url</string> </key>
......@@ -647,7 +647,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>973.33482.4166.8669</string> </value>
<value> <string>976.55467.3484.42427</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -665,7 +665,7 @@
</tuple>
<state>
<tuple>
<float>1549887971.4</float>
<float>1562230839.28</float>
<string>UTC</string>
</tuple>
</state>
......
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