Skip to content

erp5
erp5
Commit 55f0091a authored by Roque's avatar Roque
Browse files
Options

solving conflicts

parents 05b8df70 16b10406
Show whitespace changes
Inline Side-by-side
Showing with 417 additions and 42 deletions
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_js.js
View file @ 55f0091a
......@@ -48,6 +48,13 @@
if (site) {
return gadget.redirect({ command: "row", url: site});
}
// User entered wrong password ?
// Notify
return gadget.notifySubmitted({message: 'Unauthorized storage access', status: 'error'})
.push(function () {
return gadget.redirect({command: 'display',
options: {page: 'ojs_configurator'}});
});
}
throw error;
});
......@@ -60,6 +67,7 @@
gadget.state_parameter_dict = {};
})
.declareAcquiredMethod("notifySubmitted", "notifySubmitted")
.declareAcquiredMethod("redirect", "redirect")
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("setSetting", "setSetting")
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_js.xml
View file @ 55f0091a
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>973.44981.11075.37051</string> </value>
<value> <string>973.43582.44368.54391</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1550240875.4</float>
<float>1550152243.11</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_ojs_linshare_configurator_js.js
View file @ 55f0091a
......@@ -13,7 +13,16 @@
})
.push(function (setting) {
var configuration = {},
attachment_synchro = setting[1] !== "";
attachment_synchro = setting[1] !== "",
linshare_json = {
type: "linshare",
url: options.url
};
if (options.username || options.password) {
linshare_json.access_token = window.btoa(
options.username + ':' + options.password
);
}
configuration = {
type: "replicate",
query: {
......@@ -69,13 +78,7 @@
},
sub_storage: {
type: "query",
sub_storage: {
type: "linshare",
url: options.url,
access_token: window.btoa(
options.username + ':' + options.password
)
}
sub_storage: linshare_json
}
}
}
......@@ -111,7 +114,8 @@
var gadget = this;
if (options.url) {
return gadget.changeState({
url: options.url || ""
url: options.url || "",
username: options.username || ""
});
}
return gadget.getSetting('linshare_storage', "")
......@@ -160,7 +164,7 @@
"my_username": {
"description": "",
"title": "Username",
"default": "",
"default": gadget.state.username || "",
"css_class": "",
"required": 1,
"editable": 1,
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_ojs_linshare_configurator_js.xml
View file @ 55f0091a
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>973.44981.11075.37051</string> </value>
<value> <string>973.43371.54750.44595</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1550236694.62</float>
<float>1550139619.39</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs_appstore_base/PathTemplateItem/web_page_module/gadget_ojs_appstore_panel_html.html
View file @ 55f0091a
......@@ -22,7 +22,7 @@
</div>
</div>
<div class="panel_img">
<img class="ui-title" alt="OfficeJS" src="officejs_logo.png?format=png"/>
<img class="ui-title" alt="OfficeJS" src="gadget_erp5_panel.png?format=png"/>
</div>
</div>
</script>
......
bt5/erp5_officejs_appstore_base/PathTemplateItem/web_page_module/gadget_ojs_appstore_panel_html.xml
View file @ 55f0091a
......@@ -261,7 +261,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>969.52327.64978.40960</string> </value>
<value> <string>973.40404.23731.64460</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -279,7 +279,7 @@
</tuple>
<state>
<tuple>
<float>1535121191.77</float>
<float>1549966400.8</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_officejs_appstore_base/bt/dependency_list
View file @ 55f0091a
erp5_officejs
erp5_web_renderjs_ui
erp5_software_pdm
\ No newline at end of file
bt5/erp5_officejs_appstore_website/PathTemplateItem/web_page_module/store_officejs_appcache.xml
View file @ 55f0091a
......@@ -166,11 +166,7 @@ appstore/dev/index.en.html\n
appstore/dev/index.html\n
appstore/documentation/brainstorming_page_json.txt\n
appstore/documentation/documentation.txt\n
appstore/img/appjabbericon.svg\n
appstore/img/erp5-logo.png\n
appstore/img/flags.png\n
appstore/img/slapos.png\n
appstore/img/vifib-logo.png\n
appstore/\n
appstore/js/bin.js\n
appstore/js/erp5_loader.js\n
......@@ -340,7 +336,7 @@ NETWORK:\n
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>973.19272.23311.6092</string> </value>
<value> <string>973.40487.50916.35840</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -358,7 +354,7 @@ NETWORK:\n
</tuple>
<state>
<tuple>
<float>1548694049.98</float>
<float>1549966616.29</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_appcache.xml
View file @ 55f0091a
......@@ -148,6 +148,8 @@ gadget_hr_translation_data.js\n
gadget_officejs_widget_listbox.js\n
erp5_launcher.js\n
erp5_launcher.html\n
gadget_officejs_hr_web_manifest.json\n
hr_logo.svg\n
\n
gadget_officejs_page_expense_report.html\n
gadget_officejs_page_expense_report.js\n
......@@ -380,7 +382,7 @@ NETWORK:\n
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>966.59986.993.48708</string> </value>
<value> <string>973.40447.29564.60893</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -398,8 +400,8 @@ NETWORK:\n
</tuple>
<state>
<tuple>
<float>1523958492.04</float>
<string>GMT+2</string>
<float>1549964903.16</float>
<string>UTC</string>
</tuple>
</state>
</object>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_landing_html.html
View file @ 55f0091a
......@@ -10,6 +10,7 @@
<link href="font-awesome/font-awesome.css" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="jquerymobile.css">
<link rel="stylesheet" href="gadget_erp5.css">
${webapp_manifest_full_link_tag}
<script data-renderjs-configuration="application_title" type="text/x-renderjs-configuration">${application_title}</script>
<script data-renderjs-configuration="panel_gadget" type="text/x-renderjs-configuration">${panel_gadget}</script>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_landing_html.xml
View file @ 55f0091a
......@@ -222,7 +222,7 @@
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>cedric.le.ninivin</string> </value>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
......@@ -236,7 +236,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>962.4234.59641.41216</string> </value>
<value> <string>973.40447.29564.60893</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -254,7 +254,7 @@
</tuple>
<state>
<tuple>
<float>1505315239.43</float>
<float>1549964847.35</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_web_manifest_json.json 0 → 100644
View file @ 55f0091a
{
"short_name": "HR",
"name": "OfficeJS HR",
"description": "Business travel, Expense remboursement, Leave request management",
"icons": [{
"src": "hr_logo.svg",
"sizes": "any",
"type": "image/svg"
}],
"start_url": "../../",
"display": "standalone"
}
\ No newline at end of file
bt5/erp5_travel_expense/PathTemplateItem/web_page_module/gadget_hr_web_manifest_json.xml 0 → 100644
View file @ 55f0091a
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Script" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Change_local_roles_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>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Anonymous</string>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>content_md5</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>gadget_officejs_hr_web_manifest.json</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>gadget_hr_web_manifest_json</string> </value>
</item>
<item>
<key> <string>language</string> </key>
<value> <string>en</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Script</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Gadget Officejs Json Manifest HR</string> </value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>001</string> </value>
</item>
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary>
<item>
<key> <string>document_publication_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>edit_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>processing_status_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>publish_alive</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1549964659.7</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>validation_state</string> </key>
<value> <string>published_alive</string> </value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>edit</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>973.40455.26813.17629</string> </value>
</item>
<item>
<key> <string>state</string> </key>
<value> <string>current</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1549964625.59</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
<pickle>
<tuple>
<none/>
<list>
<dictionary>
<item>
<key> <string>action</string> </key>
<value> <string>detect_converted_file</string> </value>
</item>
<item>
<key> <string>actor</string> </key>
<value> <string>zope</string> </value>
</item>
<item>
<key> <string>comment</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>error_message</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_processing_state</string> </key>
<value> <string>converted</string> </value>
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>0.0.0.0</string> </value>
</item>
<item>
<key> <string>time</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1549964465.89</float>
<string>UTC</string>
</tuple>
</state>
</object>
</value>
</item>
</dictionary>
</list>
</tuple>
</pickle>
</record>
</ZopeData>
bt5/erp5_travel_expense/PathTemplateItem/web_site_module/officejs_hr.xml
View file @ 55f0091a
......@@ -299,6 +299,16 @@
<value> <string>string</string> </value>
</item>
</dictionary>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>configuration_webapp_manifest_url</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
......@@ -385,6 +395,10 @@
<key> <string>configuration_view_action_category</string> </key>
<value> <string>object_view</string> </value>
</item>
<item>
<key> <string>configuration_webapp_manifest_url</string> </key>
<value> <string>gadget_officejs_hr_web_manifest.json</string> </value>
</item>
<item>
<key> <string>configuration_x_frame_options</string> </key>
<value> <string>SAMEORIGIN</string> </value>
......@@ -624,7 +638,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>966.51303.25888.32000</string> </value>
<value> <string>973.40447.29564.60893</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -642,8 +656,8 @@
</tuple>
<state>
<tuple>
<float>1523518073.81</float>
<string>GMT+2</string>
<float>1549964409.02</float>
<string>UTC</string>
</tuple>
</state>
</object>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.js
View file @ 55f0091a
......@@ -13111,7 +13111,12 @@ return new Parser;
_linshare_uuid: entry_list[i].uuid
};
if (options.include_docs === true) {
try {
entry.doc = JSON.parse(entry_list[i].metaData) || {};
} catch (error) {
// Metadata are not always JSON
entry.doc = {};
}
}
result_list.push(entry);
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml
View file @ 55f0091a
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>973.4826.12688.30276</string> </value>
<value> <string>973.43645.19782.57207</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1548090618.17</float>
<float>1550160394.98</float>
<string>UTC</string>
</tuple>
</state>
......
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/File_viewAsWeb.py
View file @ 55f0091a
......@@ -9,6 +9,9 @@ file_content = file.getData()
# The vanilla HTML is wanted
response.setBase(None)
# Allow any external app to download the source code
response.setHeader("Access-Control-Allow-Origin", "*")
if REQUEST.getHeader('If-Modified-Since', '') == file.getModificationDate().rfc822():
response.setStatus(304)
return ""
......
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/Image_viewAsWeb.py
View file @ 55f0091a
......@@ -6,6 +6,9 @@ if response is None:
# The vanilla HTML is wanted
response.setBase(None)
# Allow any external app to download the source code
response.setHeader("Access-Control-Allow-Origin", "*")
image = context
if REQUEST.getHeader('If-Modified-Since', '') == image.getModificationDate().rfc822():
response.setStatus(304)
......
bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/WebPage_viewAsWeb.py
View file @ 55f0091a
......@@ -6,6 +6,9 @@ if response is None:
# The vanilla HTML is wanted
response.setBase(None)
# Allow any external app to download the source code
response.setHeader("Access-Control-Allow-Origin", "*")
web_page = context
web_section = REQUEST.get("current_web_section")
if web_section is None:
......
product/CMFActivity/Activity/SQLDict.py
View file @ 55f0091a
......@@ -36,11 +36,6 @@ import transaction
from zLOG import TRACE, WARNING
# Stop validating more messages when this limit is reached
MAX_VALIDATED_LIMIT = 1000
# Read up to this number of messages to validate.
READ_MESSAGE_LIMIT = 1000
class SQLDict(SQLBase):
"""
A simple OOBTree based queue. It should be compatible with transactions
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/jio.js.js
View file @ 55f0091a
......@@ -13111,7 +13111,12 @@ return new Parser;
_linshare_uuid: entry_list[i].uuid
};
if (options.include_docs === true) {
try {
entry.doc = JSON.parse(entry_list[i].metaData) || {};
} catch (error) {
// Metadata are not always JSON
entry.doc = {};
}
}
result_list.push(entry);
......
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