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
140
Merge Requests
140
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
982396a4
Commit
982396a4
authored
Mar 25, 2019
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: minor refactoring
parent
83a98943
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
39 deletions
+32
-39
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js
...e_module/gadget_officejs_controller_page_controller_js.js
+30
-37
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml
..._module/gadget_officejs_controller_page_controller_js.xml
+2
-2
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js
View file @
982396a4
...
...
@@ -40,38 +40,6 @@
return
result
;
}
function
renderForm
(
form_definition
,
document
)
{
var
raw_properties
=
form_definition
.
fields_raw_properties
;
var
form_json
=
{
erp5_document
:
{
"
_embedded
"
:
{
"
_view
"
:
{}},
"
_links
"
:
{}
},
form_definition
:
form_definition
},
i
,
j
,
fields
,
field_info
,
my_element
,
element_id
;
for
(
i
=
0
;
i
<
form_definition
.
group_list
.
length
;
i
+=
1
)
{
fields
=
form_definition
.
group_list
[
i
][
1
];
for
(
j
=
0
;
j
<
fields
.
length
;
j
+=
1
)
{
my_element
=
fields
[
j
][
0
];
if
(
my_element
.
startsWith
(
"
my_
"
))
{
element_id
=
my_element
.
replace
(
"
my_
"
,
""
);
}
else
if
(
my_element
.
startsWith
(
"
your_
"
))
{
element_id
=
my_element
.
replace
(
"
your_
"
,
""
);
}
else
{
element_id
=
my_element
;
}
if
(
raw_properties
.
hasOwnProperty
(
my_element
))
{
field_info
=
raw_properties
[
my_element
];
var
rendered_field
=
renderField
(
element_id
,
field_info
,
document
);
form_json
.
erp5_document
.
_embedded
.
_view
[
my_element
]
=
rendered_field
;
}
}
}
form_json
.
erp5_document
.
_embedded
.
_view
.
_actions
=
form_definition
.
_actions
;
form_json
.
erp5_document
.
_links
=
form_definition
.
_links
;
return
form_json
;
}
rJS
(
window
)
/////////////////////////////////////////////////////////////////
...
...
@@ -109,7 +77,35 @@
})
.
declareMethod
(
"
renderForm
"
,
function
(
form_definition
,
document
)
{
return
renderForm
(
form_definition
,
document
);
var
raw_properties
=
form_definition
.
fields_raw_properties
;
var
form_json
=
{
erp5_document
:
{
"
_embedded
"
:
{
"
_view
"
:
{}},
"
_links
"
:
{}
},
form_definition
:
form_definition
},
i
,
j
,
fields
,
field_info
,
my_element
,
element_id
;
for
(
i
=
0
;
i
<
form_definition
.
group_list
.
length
;
i
+=
1
)
{
fields
=
form_definition
.
group_list
[
i
][
1
];
for
(
j
=
0
;
j
<
fields
.
length
;
j
+=
1
)
{
my_element
=
fields
[
j
][
0
];
if
(
my_element
.
startsWith
(
"
my_
"
))
{
element_id
=
my_element
.
replace
(
"
my_
"
,
""
);
}
else
if
(
my_element
.
startsWith
(
"
your_
"
))
{
element_id
=
my_element
.
replace
(
"
your_
"
,
""
);
}
else
{
element_id
=
my_element
;
}
if
(
raw_properties
.
hasOwnProperty
(
my_element
))
{
field_info
=
raw_properties
[
my_element
];
var
rendered_field
=
renderField
(
element_id
,
field_info
,
document
);
form_json
.
erp5_document
.
_embedded
.
_view
[
my_element
]
=
rendered_field
;
}
}
}
form_json
.
erp5_document
.
_embedded
.
_view
.
_actions
=
form_definition
.
_actions
;
form_json
.
erp5_document
.
_links
=
form_definition
.
_links
;
return
form_json
;
})
.
allowPublicAcquisition
(
'
submitContent
'
,
function
(
options
)
{
...
...
@@ -142,10 +138,7 @@
return
gadget
.
jio_get
(
options
.
jio_key
)
.
push
(
function
(
document
)
{
if
(
document
.
portal_type
!==
undefined
)
{
/*child_gadget_url = 'gadget_officejs_jio_' +
result.portal_type.replace(/ /g, '_').toLowerCase() +
'_view.html';*/
// [HARDCODED] force to use form view
// use generic editable form view
child_gadget_url
=
'
gadget_erp5_pt_form_view_editable.html
'
;
}
else
{
throw
new
Error
(
'
Can not display document:
'
+
options
.
jio_key
);
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml
View file @
982396a4
...
...
@@ -225,7 +225,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
974.38
574.15384.64529
</string>
</value>
<value>
<string>
974.38
878.8625.14933
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -243,7 +243,7 @@
</tuple>
<state>
<tuple>
<float>
15535
25314.0
</float>
<float>
15535
42945.18
</float>
<string>
UTC
</string>
</tuple>
</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