Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
141
Merge Requests
141
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
00e18d22
Commit
00e18d22
authored
May 29, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Use embedded the form definition if returned by the server
Removing one query improves the speed of the UI.
parent
b05a67b3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
...plateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
+3
-0
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
...lateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
+2
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.js
...Item/web_page_module/rjs_gadget_erp5_pt_report_view_js.js
+5
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.xml
...tem/web_page_module/rjs_gadget_erp5_pt_report_view_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
View file @
00e18d22
...
@@ -158,6 +158,9 @@ and handling data send&receive.
...
@@ -158,6 +158,9 @@ and handling data send&receive.
return
promise_queue
return
promise_queue
.
push
(
function
()
{
.
push
(
function
()
{
if
(
new_state
.
erp5_document
.
_embedded
.
_view
.
hasOwnProperty
(
'
_embedded
'
))
{
return
new_state
.
erp5_document
.
_embedded
.
_view
.
_embedded
.
form_definition
;
}
var
uri
=
new
URI
(
new_state
.
erp5_document
.
_embedded
.
_view
.
_links
.
form_definition
.
href
);
var
uri
=
new
URI
(
new_state
.
erp5_document
.
_embedded
.
_view
.
_links
.
form_definition
.
href
);
return
gadget
.
jio_getAttachment
(
uri
.
segment
(
2
),
"
view
"
);
return
gadget
.
jio_getAttachment
(
uri
.
segment
(
2
),
"
view
"
);
})
})
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
View file @
00e18d22
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
967.
24634.17714.15001
</string>
</value>
<value>
<string>
967.
46234.55453.11827
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
152
6655457.44
</float>
<float>
152
7598665.68
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.js
View file @
00e18d22
...
@@ -5,10 +5,13 @@
...
@@ -5,10 +5,13 @@
function
createSectionGadget
(
gadget
,
queue
,
report_section
,
function
createSectionGadget
(
gadget
,
queue
,
report_section
,
section_list_element
)
{
section_list_element
)
{
var
uri
=
new
URI
(
report_section
.
_links
.
form_definition
.
href
),
var
form_definition
;
form_definition
;
queue
queue
.
push
(
function
()
{
.
push
(
function
()
{
if
(
report_section
.
hasOwnProperty
(
'
_embedded
'
))
{
return
report_section
.
_embedded
.
form_definition
;
}
var
uri
=
new
URI
(
report_section
.
_links
.
form_definition
.
href
);
return
gadget
.
jio_getAttachment
(
uri
.
segment
(
2
),
"
view
"
);
return
gadget
.
jio_getAttachment
(
uri
.
segment
(
2
),
"
view
"
);
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_report_view_js.xml
View file @
00e18d22
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
2.56167.53905.3147
0
</string>
</value>
<value>
<string>
96
4.58561.19908.1408
0
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
08400391.84
</float>
<float>
15
27668285.72
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
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