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
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
803c9cbf
Commit
803c9cbf
authored
Sep 25, 2019
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[erp5_web_renderjs_ui] Display a default dialog message if none received from server
parent
b6b517ee
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
6 deletions
+9
-6
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
...plateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
+7
-4
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
...lateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.js
View file @
803c9cbf
...
@@ -373,13 +373,16 @@ and handling data send&receive.
...
@@ -373,13 +373,16 @@ and handling data send&receive.
// successful form save returns simple redirect and an answer as JSON
// successful form save returns simple redirect and an answer as JSON
return
new
RSVP
.
Queue
()
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
.
push
(
function
()
{
return
jIO
.
util
.
readBlobAsText
(
attachment
.
target
.
response
);
return
RSVP
.
all
([
jIO
.
util
.
readBlobAsText
(
attachment
.
target
.
response
),
gadget
.
translate
(
'
Action succeeded.
'
)
]);
})
})
.
push
(
function
(
res
ponse_tex
t
)
{
.
push
(
function
(
res
ult_lis
t
)
{
var
response
=
JSON
.
parse
(
res
ponse_text
.
target
.
result
);
var
response
=
JSON
.
parse
(
res
ult_list
[
0
]
.
target
.
result
);
return
gadget
.
notifySubmitted
({
return
gadget
.
notifySubmitted
({
"
message
"
:
response
.
portal_status_message
,
"
message
"
:
response
.
portal_status_message
||
result_list
[
1
]
,
"
status
"
:
response
.
portal_status_level
||
"
success
"
"
status
"
:
response
.
portal_status_level
||
"
success
"
});
});
})
})
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_form_js.xml
View file @
803c9cbf
...
@@ -228,7 +228,7 @@
...
@@ -228,7 +228,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
978.
15561.54943.2556
5
</string>
</value>
<value>
<string>
978.
43862.35468.5355
5
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -246,7 +246,7 @@
...
@@ -246,7 +246,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
156
7699957.33
</float>
<float>
156
9398056.45
</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