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
144
Merge Requests
144
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
0feb08ce
Commit
0feb08ce
authored
Nov 14, 2019
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: fix promise queue and declare util gadget in html
parent
a12a5c3d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
38 deletions
+46
-38
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_ojs_panel_js.js
...Item/web_page_module/gadget_officejs_erp5_ojs_panel_js.js
+36
-33
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_ojs_panel_js.xml
...tem/web_page_module/gadget_officejs_erp5_ojs_panel_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_panel_html.html
...Item/web_page_module/gadget_officejs_erp5_panel_html.html
+5
-0
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_panel_html.xml
...eItem/web_page_module/gadget_officejs_erp5_panel_html.xml
+3
-3
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_ojs_panel_js.js
View file @
0feb08ce
...
...
@@ -275,39 +275,42 @@
}
}
queue
.
push
(
function
()
{
return
gadget
.
declareGadget
(
"
gadget_officejs_common_util.html
"
);
})
.
push
(
function
(
gadget_utils
)
{
return
gadget_utils
.
getViewAndActionDict
(
modification_dict
.
portal_type
,
modification_dict
.
jio_key
);
})
.
push
(
function
(
view_action_dict
)
{
return
RSVP
.
all
([
getElementList
(
gadget
,
view_action_dict
.
view_list
),
getElementList
(
gadget
,
view_action_dict
.
action_list
)
]);
})
.
push
(
function
(
view_action_list
)
{
var
dl_element
,
dl_fragment
=
document
.
createDocumentFragment
();
dl_element
=
gadget
.
element
.
querySelector
(
"
dl
"
);
while
(
dl_element
.
firstChild
)
{
dl_element
.
removeChild
(
dl_element
.
firstChild
);
}
if
(
view_action_list
[
0
].
length
>
0
)
{
appendDt
(
dl_fragment
,
"
VIEWS
"
,
'
eye
'
,
view_action_list
[
0
]);
dl_element
.
appendChild
(
dl_fragment
);
}
if
(
view_action_list
[
1
].
length
>
0
)
{
appendDt
(
dl_fragment
,
"
ACTIONS
"
,
'
cogs
'
,
view_action_list
[
1
]);
dl_element
.
appendChild
(
dl_fragment
);
}
return
queue
;
});
if
(
modification_dict
.
hasOwnProperty
(
"
portal_type
"
))
{
queue
.
push
(
function
()
{
return
gadget
.
getDeclaredGadget
(
"
common_util
"
);
})
.
push
(
function
(
gadget_utils
)
{
return
gadget_utils
.
getViewAndActionDict
(
modification_dict
.
portal_type
,
modification_dict
.
jio_key
);
})
.
push
(
function
(
view_action_dict
)
{
return
RSVP
.
all
([
getElementList
(
gadget
,
view_action_dict
.
view_list
),
getElementList
(
gadget
,
view_action_dict
.
action_list
)
]);
})
.
push
(
function
(
view_action_list
)
{
var
dl_element
,
dl_fragment
=
document
.
createDocumentFragment
();
dl_element
=
gadget
.
element
.
querySelector
(
"
dl
"
);
while
(
dl_element
.
firstChild
)
{
dl_element
.
removeChild
(
dl_element
.
firstChild
);
}
if
(
view_action_list
[
0
].
length
>
0
)
{
appendDt
(
dl_fragment
,
"
VIEWS
"
,
'
eye
'
,
view_action_list
[
0
]);
dl_element
.
appendChild
(
dl_fragment
);
}
if
(
view_action_list
[
1
].
length
>
0
)
{
appendDt
(
dl_fragment
,
"
ACTIONS
"
,
'
cogs
'
,
view_action_list
[
1
]);
dl_element
.
appendChild
(
dl_fragment
);
}
});
}
return
queue
;
})
/////////////////////////////////////////////////////////////////
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_ojs_panel_js.xml
View file @
0feb08ce
...
...
@@ -225,7 +225,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
979.5
1953.14282.5120
</string>
</value>
<value>
<string>
979.5
2132.14300.25702
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -243,7 +243,7 @@
</tuple>
<state>
<tuple>
<float>
15737
29132.16
</float>
<float>
15737
40764.23
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_panel_html.html
View file @
0feb08ce
...
...
@@ -64,6 +64,11 @@
<!-- custom script -->
<script
src=
"gadget_erp5_ojs_panel.js"
type=
"text/javascript"
></script>
<div
data-gadget-url=
"gadget_officejs_common_util.html"
data-gadget-scope=
"common_util"
data-gadget-sandbox=
"public"
>
</div>
</head>
<body>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_panel_html.xml
View file @
0feb08ce
...
...
@@ -215,7 +215,7 @@
</item>
<item>
<key>
<string>
actor
</string>
</key>
<value>
<string>
vincent
</string>
</value>
<value>
<string>
zope
</string>
</value>
</item>
<item>
<key>
<string>
comment
</string>
</key>
...
...
@@ -229,7 +229,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
9
64.45561.47559.959
1
</string>
</value>
<value>
<string>
9
75.50798.33418.1541
1
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -247,7 +247,7 @@
</tuple>
<state>
<tuple>
<float>
15
15509919.32
</float>
<float>
15
73739234.08
</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