Commit ac5352f3 authored by Boris Kocherov's avatar Boris Kocherov

erp5_officejs_ooffice: Use ooffice_onlyoffice_gadget union instead...

erp5_officejs_ooffice: Use ooffice_onlyoffice_gadget union instead ooffice_text_gadget, ooffice_spreadsheet_gadget, ooffice_presentation_gadget
parent 79379e62
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
"key": "text_content", "key": "text_content",
"hidden": 0, "hidden": 0,
"type": editable ? "GadgetField" : "EditorField", "type": editable ? "GadgetField" : "EditorField",
"url": "../ooffice_presentation_gadget/app/", "url": "../ooffice_onlyoffice_gadget/app/",
"sandbox": "iframe" "sandbox": "iframe"
} }
}}, }},
......
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1486996773.83</float> <float>1505775673.92</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
"key": "text_content", "key": "text_content",
"hidden": 0, "hidden": 0,
"type": editable ? "GadgetField" : "EditorField", "type": editable ? "GadgetField" : "EditorField",
"url": "../ooffice_spreadsheet_gadget/app/", "url": "../ooffice_onlyoffice_gadget/app/",
"sandbox": "iframe" "sandbox": "iframe"
} }
}}, }},
......
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1486990338.85</float> <float>1505775673.87</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
"key": "text_content", "key": "text_content",
"hidden": 0, "hidden": 0,
"type": editable ? "GadgetField" : "EditorField", "type": editable ? "GadgetField" : "EditorField",
"url": "../ooffice_text_gadget/app/", "url": "../ooffice_onlyoffice_gadget/app/",
"sandbox": "iframe" "sandbox": "iframe"
} }
}}, }},
......
...@@ -206,7 +206,7 @@ gadget_ooffice_presentation_router.html\n ...@@ -206,7 +206,7 @@ gadget_ooffice_presentation_router.html\n
gadget_officejs_jio_presentation_view.html\n gadget_officejs_jio_presentation_view.html\n
gadget_officejs_jio_presentation_view.js\n gadget_officejs_jio_presentation_view.js\n
GADGET:\n GADGET:\n
ooffice_presentation_gadget/\n ooffice_onlyoffice_gadget/\n
officejs_setting_gadget/\n officejs_setting_gadget/\n
NETWORK:\n NETWORK:\n
*</string> </value> *</string> </value>
...@@ -350,7 +350,7 @@ NETWORK:\n ...@@ -350,7 +350,7 @@ NETWORK:\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.62559.15643.59750</string> </value> <value> <string>962.11897.44034.37649</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -368,7 +368,7 @@ NETWORK:\n ...@@ -368,7 +368,7 @@ NETWORK:\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1504882731.36</float> <float>1505934130.96</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -206,7 +206,7 @@ gadget_ooffice_spreadsheet_router.html\n ...@@ -206,7 +206,7 @@ gadget_ooffice_spreadsheet_router.html\n
gadget_officejs_jio_spreadsheet_view.html\n gadget_officejs_jio_spreadsheet_view.html\n
gadget_officejs_jio_spreadsheet_view.js\n gadget_officejs_jio_spreadsheet_view.js\n
GADGET:\n GADGET:\n
ooffice_spreadsheet_gadget/\n ooffice_onlyoffice_gadget/\n
officejs_setting_gadget/\n officejs_setting_gadget/\n
NETWORK:\n NETWORK:\n
*</string> </value> *</string> </value>
...@@ -350,7 +350,7 @@ NETWORK:\n ...@@ -350,7 +350,7 @@ NETWORK:\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.62559.15643.59750</string> </value> <value> <string>962.11897.44034.37649</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -368,7 +368,7 @@ NETWORK:\n ...@@ -368,7 +368,7 @@ NETWORK:\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1504882719.22</float> <float>1505823355.1</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -206,7 +206,7 @@ gadget_ooffice_text_router.html\n ...@@ -206,7 +206,7 @@ gadget_ooffice_text_router.html\n
gadget_officejs_jio_text_view.html\n gadget_officejs_jio_text_view.html\n
gadget_officejs_jio_text_view.js\n gadget_officejs_jio_text_view.js\n
GADGET:\n GADGET:\n
ooffice_text_gadget/\n ooffice_onlyoffice_gadget/\n
officejs_setting_gadget/\n officejs_setting_gadget/\n
NETWORK:\n NETWORK:\n
*</string> </value> *</string> </value>
...@@ -305,7 +305,7 @@ NETWORK:\n ...@@ -305,7 +305,7 @@ NETWORK:\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1486994132.95</float> <float>1506438294.86</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
...@@ -149,6 +149,33 @@ ...@@ -149,6 +149,33 @@
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value> </value>
</item> </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> <item>
<key> <string>_range_criterion</string> </key> <key> <string>_range_criterion</string> </key>
<value> <value>
...@@ -159,10 +186,20 @@ ...@@ -159,10 +186,20 @@
<key> <string>categories</string> </key> <key> <string>categories</string> </key>
<value> <value>
<tuple> <tuple>
<string>aggregate/web_page_module/gadget_ooffice_spreadsheet_gadget_landing_page.html</string> <string>aggregate/web_page_module/gadget_ooffice_onlyoffice_landing_html</string>
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>configuration_content_security_policy</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>configuration_x_frame_options</string> </key>
<value> <string>ALLOW-FROM-ALL</string> </value>
</item>
<item> <item>
<key> <string>custom_render_method_id</string> </key> <key> <string>custom_render_method_id</string> </key>
<value> <string>WebSection_renderOfficeJSApplicationPage</string> </value> <value> <string>WebSection_renderOfficeJSApplicationPage</string> </value>
...@@ -175,24 +212,12 @@ ...@@ -175,24 +212,12 @@
</item> </item>
<item> <item>
<key> <string>empty_criterion_valid</string> </key> <key> <string>empty_criterion_valid</string> </key>
<value> <int>1</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>app</string> </value> <value> <string>app</string> </value>
</item> </item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Static Web Section</string> </value> <value> <string>Static Web Section</string> </value>
...@@ -207,21 +232,9 @@ ...@@ -207,21 +232,9 @@
<key> <string>skin_selection_name</string> </key> <key> <string>skin_selection_name</string> </key>
<value> <string>Officejs</string> </value> <value> <string>Officejs</string> </value>
</item> </item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>OnlyOffice Spreadsheet Gadget App</string> </value> <value> <string>OnlyOffice Gadget Development</string> </value>
</item> </item>
<item> <item>
<key> <string>visible</string> </key> <key> <string>visible</string> </key>
...@@ -339,7 +352,7 @@ ...@@ -339,7 +352,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1496061304.67</float> <float>1501316622.8</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
...@@ -384,7 +397,7 @@ ...@@ -384,7 +397,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.56848.50657.15342</string> </value> <value> <string>962.33307.9661.63522</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -402,7 +415,7 @@ ...@@ -402,7 +415,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1504539892.15</float> <float>1506973174.73</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
document_module/ooffice_*
web_page_module/gadget_ooffice_* web_page_module/gadget_ooffice_*
web_page_module/ooffice_*
image_module/ooffice_*
web_site_module/ooffice_presentation web_site_module/ooffice_presentation
web_site_module/ooffice_presentation/** web_site_module/ooffice_presentation/**
web_site_module/ooffice_presentation_gadget web_site_module/ooffice_onlyoffice_gadget
web_site_module/ooffice_presentation_gadget/** web_site_module/ooffice_onlyoffice_gadget/**
web_site_module/ooffice_spreadsheet web_site_module/ooffice_spreadsheet
web_site_module/ooffice_spreadsheet/** web_site_module/ooffice_spreadsheet/**
web_site_module/ooffice_spreadsheet_gadget
web_site_module/ooffice_spreadsheet_gadget/**
web_site_module/ooffice_text web_site_module/ooffice_text
web_site_module/ooffice_text/** web_site_module/ooffice_text/**
\ No newline at end of file
web_site_module/ooffice_text_gadget
web_site_module/ooffice_text_gadget/**
\ No newline at end of file
document_module/ooffice_*
web_page_module/gadget_ooffice_* web_page_module/gadget_ooffice_*
web_page_module/ooffice_*
image_module/ooffice_*
web_site_module/ooffice_presentation web_site_module/ooffice_presentation
web_site_module/ooffice_presentation/** web_site_module/ooffice_presentation/**
web_site_module/ooffice_presentation_gadget web_site_module/ooffice_onlyoffice_gadget
web_site_module/ooffice_presentation_gadget/** web_site_module/ooffice_onlyoffice_gadget/**
web_site_module/ooffice_spreadsheet web_site_module/ooffice_spreadsheet
web_site_module/ooffice_spreadsheet/** web_site_module/ooffice_spreadsheet/**
web_site_module/ooffice_spreadsheet_gadget
web_site_module/ooffice_spreadsheet_gadget/**
web_site_module/ooffice_text web_site_module/ooffice_text
web_site_module/ooffice_text/** web_site_module/ooffice_text/**
\ No newline at end of file
web_site_module/ooffice_text_gadget
web_site_module/ooffice_text_gadget/**
\ No newline at end of file
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