Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Yusei Tahara
erp5
Commits
7bec2c3d
Commit
7bec2c3d
authored
9 years ago
by
Romain Courteaud
Browse files
Options
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Update jIO 3.10.0
parent
87e8ef5e
master
allow_login_change_differentiate_id_and_login
arnau
arnau-fec
arnau-real-time-inventory-accounting
bt5_config
callable-jupyter-storage
catalog_filter
cherry-pick-243c2f03
cherry-pick-4a8e045d
cleanup/zsql_method_arguments_backslash_n
cleanup_acquisition_base_category
compact_title_no_reference
datetime_key_change_date_delimiter_dash_timezone
delivery_item_barcode
dsn-phase3
erp5-component
erp5-vifib
erp5_catalog
erp5_catalog_final
erp5js_searcheditor_date_bug
erp5js_searcheditor_date_bug2
erp5jslistbox
erp5testnode_max_timeout
experiment/coding_style_test_suite
feat/accounting_stop_using_getObject
feat/accounting_translate_gap
feat/delete_on_category_workflow
feat/longer_language_cookie
feat/new_test_template_suggest_bad_coding_practice
feat/olapy
feat/pdm_content_translation
feat/publication_workflow_transitions
feat/remove_owner_role_permissions_on_document_workflow
feat/test_inventory_api_domain_selection
feat/trade_shipment_report
feat/wendelin-py-data
feature/accounting-reports-stats
feature/hal-actions-support
feature/hal-support-update
feature/jio-accounting-reports
feature/jio-selection-actions
feature/json-allows-all-jio-actions
feature/renderjs-matrixbox
feature/renderjs-ui-no-header
feature/rjs-listbox-stats
feature/rjs-print-action
fix/bank_reconciliation_with_internal_transaction
fix/consistency_check_alarm
fix/edit_activity_pending_error
fix/full_text_script_conflict
fix/generate_source_reference_after_ptg_clone
fix/login_validate_check_consistency
fix/multiple_small_fixes_to_zodb_history_tab
fix/notification_message_references
fix_hateoas_localizer
for_testrunner_1
for_testrunner_2
for_testrunner_3
gadget-json-value
heads/fix/notification_tool_unauthorized
hotfix/accounting-test-timeout
hotfix/callable_tool
hotfix/field-keeps-request
hotfix/jio_view
hotfix/pdm-test
hotfix/rjs-editability
hotfix/rjs-form-less-invasive
hotfix/rjs-formfields-padding
hotfix/rjs-listbox-mutex
hotfix/tests-cleanup
initsite
isDeletable
jm/form-action-guard
joblib-activity
listbox_url
macros_fix
maste_copy
master_calendar_wip_patches
master_calendar_wip_patches_extend_security
monitoring
monitoring-graph
no_longer_simulated_state
officejs_clean
officejs_zip
ojs_wip
portal_callables
refactor/base_edit
refactor/renderjs
reindex_calendar_after_change_calendar_exception
reverse_logistics
revert-38554dbe
rewrite_test_21_AcquiredPortalType
scalability-roque
scalability-roque-2
scalability-roque-runner
sms_more_than_140_characters
sws_fix
taskdistribution-xmlrpc-binary
tmp/getInstalledBusinessTemplate_never_installed_bt
view-aggregated-amounts
yusei_erp5js_listbox_link
yusei_functional_test_firefox
yusei_service_worker
yusei_testnode
test-ui
test-rjsacc
test-rjs
renderjs-test
erp5.util-0.4.49
erp5.util-0.4.46
erp5.util-0.4.44
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
95 additions
and
22 deletions
+95
-22
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml
...nderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml
+95
-22
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_jio_js.xml
View file @
7bec2c3d
...
@@ -107,6 +107,7 @@
...
@@ -107,6 +107,7 @@
<key>
<string>
text_content
</string>
</key>
<key>
<string>
text_content
</string>
</key>
<value>
<string
encoding=
"cdata"
>
<![CDATA[
<value>
<string
encoding=
"cdata"
>
<![CDATA[
\n
/*! URI.js v1.12.0 http://medialize.github.com/URI.js/ */\n
/*! URI.js v1.12.0 http://medialize.github.com/URI.js/ */\n
/* build contains: IPv6.js, punycode.js, SecondLevelDomains.js, URI.js, URI.fragmentQuery.js */\n
/* build contains: IPv6.js, punycode.js, SecondLevelDomains.js, URI.js, URI.fragmentQuery.js */\n
(function(e,k){"object"===typeof exports?module.exports=k():"function"===typeof define&&define.amd?define(k):e.IPv6=k(e)})(this,function(e){var k=e&&e.IPv6;return{best:function(e){e=e.toLowerCase().split(":");var k=e.length,d=8;""===e[0]&&""===e[1]&&""===e[2]?(e.shift(),e.shift()):""===e[0]&&""===e[1]?e.shift():""===e[k-1]&&""===e[k-2]&&e.pop();k=e.length;-1!==e[k-1].indexOf(".")&&(d=7);var g;for(g=0;g<k&&""!==e[g];g++);if(g<d)for(e.splice(g,1,"0000");e.length<d;)e.splice(g,0,"0000");for(g=0;g<d;g++){for(var k=\n
(function(e,k){"object"===typeof exports?module.exports=k():"function"===typeof define&&define.amd?define(k):e.IPv6=k(e)})(this,function(e){var k=e&&e.IPv6;return{best:function(e){e=e.toLowerCase().split(":");var k=e.length,d=8;""===e[0]&&""===e[1]&&""===e[2]?(e.shift(),e.shift()):""===e[0]&&""===e[1]?e.shift():""===e[k-1]&&""===e[k-2]&&e.pop();k=e.length;-1!==e[k-1].indexOf(".")&&(d=7);var g;for(g=0;g<k&&""!==e[g];g++);if(g<d)for(e.splice(g,1,"0000");e.length<d;)e.splice(g,0,"0000");for(g=0;g<d;g++){for(var k=\n
...
@@ -7078,11 +7079,12 @@ return new Parser;\n
...
@@ -7078,11 +7079,12 @@ return new Parser;\n
}\n
}\n
\n
\n
function
checkSignatureDifference(queue,
source,
destination,
id,\n
function
checkSignatureDifference(queue,
source,
destination,
id,\n
conflict_force,
conflict_ignore)
{\n
conflict_force,
conflict_ignore,\n
getMethod)
{\n
queue\n
queue\n
.push(function
()
{\n
.push(function
()
{\n
return
RSVP.all([\n
return
RSVP.all([\n
source.get
(id),\n
getMethod
(id),\n
context._signature_sub_storage.get(id)\n
context._signature_sub_storage.get(id)\n
]);\n
]);\n
})\n
})\n
...
@@ -7129,6 +7131,35 @@ return new Parser;\n
...
@@ -7129,6 +7131,35 @@ return new Parser;\n
}\n
}\n
});\n
});\n
}\n
}\n
\n
function
checkBulkSignatureDifference(queue,
source,
destination,
id_list,\n
conflict_force,
conflict_ignore)
{\n
queue\n
.push(function
()
{\n
return
source.bulk(id_list);\n
})\n
.push(function
(result_list)
{\n
var
i,\n
sub_queue =
new
RSVP.Queue();\n
\n
function
getResult(j)
{\n
return
function
(id)
{\n
if
(id
!==
id_list[j].parameter_list[0])
{\n
throw
new
Error("Does
not
access
expected
ID
"
+
id);\n
}\n
return
result_list[j];\n
};\n
}\n
\n
for
(
i =
0;
i
<
result_list.length;
i
+=
1)
{\n
checkSignatureDifference(sub_queue,
source,
destination,\n
id_list[i].parameter_list[0],\n
conflict_force,
conflict_ignore,\n
getResult(i));\n
}\n
return
sub_queue;\n
});\n
}\n
\n
\n
function
pushStorage(source,
destination,
options)
{\n
function
pushStorage(source,
destination,
options)
{\n
var
queue =
new
RSVP.Queue();\n
var
queue =
new
RSVP.Queue();\n
...
@@ -7146,6 +7177,7 @@ return new Parser;\n
...
@@ -7146,6 +7177,7 @@ return new Parser;\n
var
i,\n
var
i,\n
local_dict =
{},\n
local_dict =
{},\n
new_list =
[],\n
new_list =
[],\n
change_list =
[],\n
signature_dict =
{},\n
signature_dict =
{},\n
key;\n
key;\n
for
(
i =
0;
i
<
result_list[0].data.total_rows;
i
+=
1)
{\n
for
(
i =
0;
i
<
result_list[0].data.total_rows;
i
+=
1)
{\n
...
@@ -7188,9 +7220,17 @@ return new Parser;\n
...
@@ -7188,9 +7220,17 @@ return new Parser;\n
if
(signature_dict.hasOwnProperty(key))
{\n
if
(signature_dict.hasOwnProperty(key))
{\n
if
(local_dict.hasOwnProperty(key))
{\n
if
(local_dict.hasOwnProperty(key))
{\n
if
(
options.check_modification =
==
true)
{\n
if
(
options.check_modification =
==
true)
{\n
checkSignatureDifference(queue,
source,
destination,
key,\n
if
(
options.use_bulk_get =
==
true)
{\n
options.conflict_force,\n
change_list.push({\n
options.conflict_ignore);\n
method:
"get",\n
parameter_list:
[key]\n
});\n
}
else
{\n
checkSignatureDifference(queue,
source,
destination,
key,\n
options.conflict_force,\n
options.conflict_ignore,\n
source.get.bind(source));\n
}\n
}\n
}\n
}
else
{\n
}
else
{\n
if
(
options.check_deletion =
==
true)
{\n
if
(
options.check_deletion =
==
true)
{\n
...
@@ -7199,6 +7239,12 @@ return new Parser;\n
...
@@ -7199,6 +7239,12 @@ return new Parser;\n
}\n
}\n
}\n
}\n
}\n
}\n
if
((
options.use_bulk_get =
==
true)
&&
(change_list.length
!==
0))
{\n
checkBulkSignatureDifference(queue,
source,
destination,\n
change_list,\n
options.conflict_force,\n
options.conflict_ignore);\n
}\n
});\n
});\n
}\n
}\n
\n
\n
...
@@ -9061,8 +9107,10 @@ return new Parser;\n
...
@@ -9061,8 +9107,10 @@ return new Parser;\n
});\n
});\n
};\n
};\n
\n
\n
ERP5Storage.prototype.getAttachment =
function
(id,
action)
{\n
ERP5Storage.prototype.getAttachment =
function
(id,
action,
options)
{\n
\n
if
(
options =
==
undefined)
{\n
options =
{};\n
}\n
if
(
action =
==
"view")
{\n
if
(
action =
==
"view")
{\n
if
(
this._default_view_reference =
==
undefined)
{\n
if
(
this._default_view_reference =
==
undefined)
{\n
throw
new
jIO.util.jIOError(\n
throw
new
jIO.util.jIOError(\n
...
@@ -9074,7 +9122,6 @@ return new Parser;\n
...
@@ -9074,7 +9122,6 @@ return new Parser;\n
{"_view":
this._default_view_reference})\n
{"_view":
this._default_view_reference})\n
.push(function
(response)
{\n
.push(function
(response)
{\n
var
result =
JSON.parse(response.target.responseText);\n
var
result =
JSON.parse(response.target.responseText);\n
result._id =
id;\n
result.portal_type =
result._links.type.name;\n
result.portal_type =
result._links.type.name;\n
//
Remove
all
ERP5
hateoas
links
/
convert
them
into
jIO
ID\n
//
Remove
all
ERP5
hateoas
links
/
convert
them
into
jIO
ID\n
\n
\n
...
@@ -9100,21 +9147,47 @@ return new Parser;\n
...
@@ -9100,21 +9147,47 @@ return new Parser;\n
if
(action.indexOf(this._url)
===
0)
{\n
if
(action.indexOf(this._url)
===
0)
{\n
return
new
RSVP.Queue()\n
return
new
RSVP.Queue()\n
.push(function
()
{\n
.push(function
()
{\n
return
jIO.util.ajax({\n
var
start,\n
"type":
"GET",\n
end,\n
"url":
action,\n
range,\n
"xhrFields":
{\n
request_options =
{\n
withCredentials:
true\n
"type":
"GET",\n
"dataType":
"blob",\n
"url":
action,\n
"xhrFields":
{\n
withCredentials:
true\n
}\n
};\n
if
(options.start
!==
undefined
||
options.end
!==
undefined)
{\n
start =
options.start
||
0;\n
end =
options.end;\n
if
(end
!==
undefined
&&
end
<
0)
{\n
throw
new
jIO.util.jIOError("end
must
be
positive",\n
400);\n
}\n
if
(start
<
0)
{\n
range =
"bytes="
+
start;\n
}
else
if
(
end =
==
undefined)
{\n
range =
"bytes="
+
start
+
"-";\n
}
else
{\n
if
(start
>
end) {\n
throw new jIO.util.jIOError("start is greater than end",\n
400);\n
}\n
range = "bytes=" + start + "-" + end;\n
}\n
}\n
});\n
request_options.headers = {Range: range};\n
}\n
return jIO.util.ajax(request_options);\n
})\n
})\n
.push(function (evt) {\n
.push(function (evt) {\n
var
result =
JSON.parse(evt.target.responseText);\n
if (evt.target.response === undefined) {\n
result._id =
id;\n
return new Blob(\n
return
new
Blob(\n
[evt.target.responseText],\n
[JSON.stringify(result)],\n
{"type": evt.target.getResponseHeader("Content-Type")}\n
{"type":
evt.target.getResponseHeader("Content-Type")}\n
);\n
);\n
}\n
return evt.target.response;\n
});\n
});\n
}\n
}\n
throw new jIO.util.jIOError("ERP5: not support get attachment: " + action,\n
throw new jIO.util.jIOError("ERP5: not support get attachment: " + action,\n
...
@@ -11244,7 +11317,7 @@ return new Parser;\n
...
@@ -11244,7 +11317,7 @@ return new Parser;\n
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
94
8.40455.21934.24285
</string>
</value>
<value>
<string>
94
9.22191.39286.53384
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -11262,7 +11335,7 @@ return new Parser;\n
...
@@ -11262,7 +11335,7 @@ return new Parser;\n
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
145
3389823.29
</float>
<float>
145
6225163.58
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment