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
139
Merge Requests
139
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
affec7de
Commit
affec7de
authored
May 24, 2019
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: submit handled by form view instead of controller
parent
86591014
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
9 deletions
+14
-9
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js
...e_module/gadget_officejs_controller_page_controller_js.js
+1
-4
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml
..._module/gadget_officejs_controller_page_controller_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.js
...plateItem/web_page_module/gadget_officejs_form_view_js.js
+9
-1
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.xml
...lateItem/web_page_module/gadget_officejs_form_view_js.xml
+2
-2
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.js
View file @
affec7de
...
@@ -137,10 +137,7 @@
...
@@ -137,10 +137,7 @@
var
argument_list
=
arguments
;
var
argument_list
=
arguments
;
return
this
.
getDeclaredGadget
(
'
form_view
'
)
return
this
.
getDeclaredGadget
(
'
form_view
'
)
.
push
(
function
(
view_gadget
)
{
.
push
(
function
(
view_gadget
)
{
return
view_gadget
.
getDeclaredGadget
(
'
fg
'
);
return
view_gadget
.
triggerSubmit
(
argument_list
);
})
.
push
(
function
(
gadget
)
{
return
gadget
.
triggerSubmit
.
apply
(
gadget
,
argument_list
);
});
});
});
});
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_controller_js.xml
View file @
affec7de
...
@@ -225,7 +225,7 @@
...
@@ -225,7 +225,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
975.6
0837.8816.16179
</string>
</value>
<value>
<string>
975.6
1034.6128.3037
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -243,7 +243,7 @@
...
@@ -243,7 +243,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15587
06589.95
</float>
<float>
15587
18052.37
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.js
View file @
affec7de
...
@@ -95,6 +95,13 @@
...
@@ -95,6 +95,13 @@
return
form_json
;
return
form_json
;
})
})
.
declareMethod
(
"
triggerSubmit
"
,
function
(
argument_list
)
{
return
this
.
getDeclaredGadget
(
'
fg
'
)
.
push
(
function
(
gadget
)
{
return
gadget
.
triggerSubmit
(
argument_list
);
});
})
.
declareMethod
(
"
render
"
,
function
(
options
)
{
.
declareMethod
(
"
render
"
,
function
(
options
)
{
var
fragment
=
document
.
createElement
(
'
div
'
),
var
fragment
=
document
.
createElement
(
'
div
'
),
gadget
=
this
,
gadget
=
this
,
...
@@ -115,7 +122,8 @@
...
@@ -115,7 +122,8 @@
.
declareMethod
(
"
renderSubGadget
"
,
function
(
options
,
subgadget
,
form_json
)
{
.
declareMethod
(
"
renderSubGadget
"
,
function
(
options
,
subgadget
,
form_json
)
{
var
this_gadget
=
this
,
erp5_document
=
form_json
.
erp5_document
,
var
this_gadget
=
this
,
erp5_document
=
form_json
.
erp5_document
,
page_title
=
options
.
portal_type
,
add_url
;
page_title
=
options
.
portal_type
,
add_url
=
false
;
return
subgadget
.
render
({
return
subgadget
.
render
({
jio_key
:
options
.
jio_key
,
jio_key
:
options
.
jio_key
,
doc
:
options
.
doc
,
doc
:
options
.
doc
,
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_form_view_js.xml
View file @
affec7de
...
@@ -269,7 +269,7 @@
...
@@ -269,7 +269,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
975.
46515.39016.26350
</string>
</value>
<value>
<string>
975.
61035.13847.33843
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -287,7 +287,7 @@
...
@@ -287,7 +287,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
155
7927355.8
4
</float>
<float>
155
8718116.9
4
</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