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
Laurent S
erp5
Commits
7f890e75
Commit
7f890e75
authored
Mar 14, 2018
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Reset launcher state in case of error
parent
6f66bae9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
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
+3
-1
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 @
7f890e75
...
@@ -542,6 +542,8 @@
...
@@ -542,6 +542,8 @@
gadget
.
props
.
content_element
.
innerHTML
=
"
<br/><br/><br/><pre></pre>
"
;
gadget
.
props
.
content_element
.
innerHTML
=
"
<br/><br/><br/><pre></pre>
"
;
gadget
.
props
.
content_element
.
querySelector
(
'
pre
'
).
textContent
=
gadget
.
props
.
content_element
.
querySelector
(
'
pre
'
).
textContent
=
"
Error:
"
+
gadget
.
state
.
error_text
;
"
Error:
"
+
gadget
.
state
.
error_text
;
// reset gadget state
gadget
.
state
=
{};
// XXX Notify error
// XXX Notify error
});
});
}
}
...
@@ -631,7 +633,7 @@
...
@@ -631,7 +633,7 @@
},
function
(
error
)
{
},
function
(
error
)
{
return
decreaseLoadingCounter
(
gadget
)
return
decreaseLoadingCounter
(
gadget
)
.
push
(
function
()
{
.
push
(
function
()
{
throw
error
;
return
displayError
(
gadget
,
error
)
;
});
});
});
});
})
})
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.xml
View file @
7f890e75
...
@@ -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
5.3167.36247.3959
</string>
</value>
<value>
<string>
96
6.11429.50874.16537
</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
19038006.66
</float>
<float>
15
21043626.08
</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