Skip to content

erp5
erp5
Commit ddab98f9 authored by Roque's avatar Roque Committed by Roque
Browse files
Options

erp5_officejs: minor refactoring and fixes on new officejs approach 

- redirect to sync when app version changes
- fix configuration searchable fields in list form
- fix codemirror editor gadgetField
- fix exception catch in action script
- handle jio not found error for document
parent 33a1d714
Hide whitespace changes
Inline Side-by-side
Showing with 210 additions and 208 deletions
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.js
View file @ ddab98f9
/*global document, window, rJS, RSVP */
/*global document, window, rJS, RSVP, jIO, console */
/*jslint nomen: true, indent: 2, maxerr: 10, maxlen: 80 */
(function (document, window, rJS, RSVP) {
(function (document, window, rJS, RSVP, jIO, console) {
"use strict";
rJS(window)
......@@ -34,11 +34,11 @@
return gadget.getSetting("migration_version")
.push(function (migration_version) {
if (migration_version !== current_version) {
//if app version has changed, force storage sync
//if app version has changed, force storage selection
return gadget.redirect({
'command': 'display',
'options': {
'page': 'ojs_sync',
'page': 'ojs_configurator',
'auto_repair': true
}
});
......@@ -90,6 +90,17 @@
form_type: form_definition.form_type,
view: options.view || app_view
});
}, function (error) {
// jio not found error
if ((error instanceof jIO.util.jIOError) &&
(error.status_code === 404)) {
console.log(error);
return gadget.notifySubmitted({
message: error.message + ". Maybe syncronize?",
status: "error"
});
}
throw error;
});
})
......@@ -153,4 +164,4 @@
});
});
}(document, window, rJS, RSVP));
\ No newline at end of file
}(document, window, rJS, RSVP, jIO, console));
\ No newline at end of file
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.xml
View file @ ddab98f9
......@@ -228,7 +228,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>978.36723.12245.1757</string> </value>
<value> <string>978.57300.17773.6331</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -246,7 +246,7 @@
</tuple>
<state>
<tuple>
<float>1568969561.34</float>
<float>1570117898.93</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_codemirror/WebPageModule_viewWebPageListAsJioForCodemirror/listbox.xml
View file @ ddab98f9
......@@ -211,28 +211,7 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
<list/>
</value>
</item>
<item>
......@@ -285,6 +264,26 @@
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value>
</item>
......
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_codemirror/WebPage_viewAsJioForCodemirror/my_text_content.xml
View file @ ddab98f9
......@@ -224,8 +224,8 @@
<value>
<list>
<tuple>
<string>{"editor": "codemirror", "maximize": true}</string>
<string>{"editor": "codemirror", "maximize": true}</string>
<string>{"editor": "codemirror", "maximize": true, "portal_type": "Web Script"}</string>
<string>{"editor": "codemirror", "maximize": true, "portal_type": "Web Script"}</string>
</tuple>
</list>
</value>
......
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_pdf_viewer/DocumentModule_viewDocumentListAsJioForPdfViewer/listbox.xml
View file @ ddab98f9
......@@ -211,28 +211,7 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
<list/>
</value>
</item>
<item>
......@@ -285,6 +264,26 @@
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value>
</item>
......
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_officejs_svg_editor/WebPageModule_viewWebPageListAsJioForSvgEditor/listbox.xml
View file @ ddab98f9
......@@ -215,28 +215,7 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
<list/>
</value>
</item>
<item>
......@@ -293,6 +272,26 @@
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value>
</item>
......
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_text_editor/WebPageModule_viewWebPageListAsJioForTextEditor/listbox.xml
View file @ ddab98f9
......@@ -211,28 +211,7 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
<list/>
</value>
</item>
<item>
......@@ -285,6 +264,26 @@
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value>
</item>
......
bt5/erp5_officejs/SkinTemplateItem/portal_skins/erp5_web_officejs_ui/Base_createAppConfigurationManifest.py
View file @ ddab98f9
......@@ -142,7 +142,7 @@ try:
appcache_manifest.setTextContent(appcache_content)
except Exception as e:
except (ValueError, KeyError, SyntaxError) as e:
if batch_mode:
return 'ERROR: ' + str(e)
return context.Base_redirect('view', keep_items=dict(portal_status_message='ERROR creating configuration manifest: ' + str(e)))
......
bt5/erp5_officejs_jquery_app/SkinTemplateItem/portal_skins/erp5_image_editor/ImageModule_viewImageListAsJioForImageEditor/listbox.xml
View file @ ddab98f9
......@@ -215,28 +215,7 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
<list/>
</value>
</item>
<item>
......@@ -293,6 +272,26 @@
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value>
</item>
......
bt5/erp5_officejs_jquery_app/SkinTemplateItem/portal_skins/erp5_web_table_editor/WebPageModule_viewWebTableListAsJioForWebTableEditor/listbox.xml
View file @ ddab98f9
......@@ -211,28 +211,7 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
<list/>
</value>
</item>
<item>
......@@ -285,6 +264,26 @@
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value>
</item>
......
bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_presentation_editor/DocumentModule_viewDocumentListAsJioForOofficePresentationEditor/listbox.xml
View file @ ddab98f9
......@@ -211,28 +211,7 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
<list/>
</value>
</item>
<item>
......@@ -285,6 +264,26 @@
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value>
</item>
......
bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_spreadsheet_editor/DocumentModule_viewDocumentListAsJioForOofficeSpreadsheetEditor/listbox.xml
View file @ ddab98f9
......@@ -211,28 +211,7 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
<list/>
</value>
</item>
<item>
......@@ -285,6 +264,26 @@
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value>
</item>
......
bt5/erp5_officejs_ooffice/SkinTemplateItem/portal_skins/erp5_ooffice_text_editor/DocumentModule_viewDocumentListAsJioForOofficeTextEditor/listbox.xml
View file @ ddab98f9
......@@ -211,28 +211,7 @@
<item>
<key> <string>domain_root_list</string> </key>
<value>
<list>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
<list/>
</value>
</item>
<item>
......@@ -285,6 +264,26 @@
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>language</string>
<string>Language</string>
</tuple>
<tuple>
<string>description</string>
<string>Description</string>
</tuple>
<tuple>
<string>version</string>
<string>Version</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value>
</item>
......
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