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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
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
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
erp5
Commits
18f94b2f
Commit
18f94b2f
authored
Nov 28, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Launcher: after displaying an error, reset to the initial gadget state
parent
f7d9232b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
...mplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
+9
-8
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
...plateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
View file @
18f94b2f
...
...
@@ -5,7 +5,13 @@
XMLHttpRequest
,
location
,
console
,
navigator
,
ProgressEvent
)
{
"
use strict
"
;
var
MAIN_SCOPE
=
"
m
"
;
var
MAIN_SCOPE
=
"
m
"
,
default_state_json_string
=
JSON
.
stringify
({
panel_visible
:
false
,
setting_id
:
"
setting/
"
+
document
.
head
.
querySelector
(
'
script[data-renderjs-configuration="application_title"]
'
).
textContent
});
function
renderMainGadget
(
gadget
,
url
,
options
)
{
var
page_gadget
;
...
...
@@ -243,12 +249,7 @@
{
mutex
:
'
declareAndExecuteEditorPanelGadget
'
}
)
.
setState
({
panel_visible
:
false
,
setting_id
:
"
setting/
"
+
document
.
head
.
querySelector
(
'
script[data-renderjs-configuration="application_title"]
'
).
textContent
})
.
setState
(
JSON
.
parse
(
default_state_json_string
))
.
ready
(
function
()
{
var
gadget
=
this
,
setting_gadget
,
...
...
@@ -605,7 +606,7 @@
gadget
.
props
.
content_element
.
querySelector
(
'
pre
'
).
textContent
=
"
Error:
"
+
gadget
.
state
.
error_text
;
// reset gadget state
gadget
.
state
=
{}
;
gadget
.
state
=
JSON
.
parse
(
default_state_json_string
)
;
// XXX Notify error
});
}
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
View file @
18f94b2f
...
...
@@ -230,7 +230,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
971.
53509.42083.38280
</string>
</value>
<value>
<string>
971.
61005.64164.54442
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>
154
2969999.44
</float>
<float>
154
3420133.66
</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