Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
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
1
Merge Requests
1
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
Romain Courteaud
slapos.core
Commits
10166bb4
Commit
10166bb4
authored
1 year ago
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Redirect to the instance after request
Use response from putAttachment to get the relative URL
parent
94999b09
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
10 deletions
+20
-10
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_add_instance_tree_js.js
..._module/rjs_gadget_erp5_page_slap_add_instance_tree_js.js
+18
-8
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_add_instance_tree_js.xml
...module/rjs_gadget_erp5_page_slap_add_instance_tree_js.xml
+2
-2
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_add_instance_tree_js.js
View file @
10166bb4
/*global window, rJS, RSVP, btoa */
/*global window, rJS, RSVP, btoa
, jIO, JSON
*/
/*jslint nomen: true, indent: 2, maxerr: 3, sub:true */
/*jslint nomen: true, indent: 2, maxerr: 3, sub:true */
(
function
(
window
,
rJS
,
RSVP
)
{
(
function
(
window
,
rJS
,
RSVP
,
btoa
,
jIO
,
JSON
)
{
"
use strict
"
;
"
use strict
"
;
rJS
(
window
)
rJS
(
window
)
...
@@ -50,12 +50,22 @@
...
@@ -50,12 +50,22 @@
return
gadget
.
jio_putAttachment
(
doc
.
relative_url
,
return
gadget
.
jio_putAttachment
(
doc
.
relative_url
,
url
+
doc
.
relative_url
+
"
/SoftwareRelease_requestInstanceTree
"
,
doc
);
url
+
doc
.
relative_url
+
"
/SoftwareRelease_requestInstanceTree
"
,
doc
);
})
})
.
push
(
function
(
attachment
)
{
return
new
RSVP
.
Queue
()
.
push
(
function
()
{
.
push
(
function
()
{
return
jIO
.
util
.
readBlobAsText
(
attachment
.
target
.
response
);
})
.
push
(
function
(
response
)
{
return
JSON
.
parse
(
response
.
target
.
result
);
})
.
push
(
function
(
relative_url
)
{
return
gadget
.
notifySubmitted
({
message
:
gadget
.
message2_translation
,
status
:
'
success
'
})
return
gadget
.
notifySubmitted
({
message
:
gadget
.
message2_translation
,
status
:
'
success
'
})
.
push
(
function
()
{
.
push
(
function
()
{
// Workaround, find a way to open document without break gadget.
// Workaround, find a way to open document without break gadget.
return
gadget
.
redirect
({
"
command
"
:
"
change
"
,
return
gadget
.
redirect
({
"
command
"
:
"
change
"
,
"
options
"
:
{
"
jio_key
"
:
"
/
"
,
"
page
"
:
"
slap_service_list
"
}});
"
options
"
:
{
"
jio_key
"
:
relative_url
,
"
page
"
:
"
slap_controller
"
}});
});
});
});
},
function
(
error
)
{
},
function
(
error
)
{
if
(
error
.
target
.
status
===
409
)
{
if
(
error
.
target
.
status
===
409
)
{
...
@@ -224,4 +234,4 @@
...
@@ -224,4 +234,4 @@
});
});
});
});
});
});
}(
window
,
rJS
,
RSVP
));
}(
window
,
rJS
,
RSVP
,
btoa
,
jIO
,
JSON
));
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_add_instance_tree_js.xml
View file @
10166bb4
...
@@ -283,7 +283,7 @@
...
@@ -283,7 +283,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
100
0.31175.43828.12919
</string>
</value>
<value>
<string>
100
8.22803.51783.61098
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -303,7 +303,7 @@
...
@@ -303,7 +303,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
16
69310140.1
3
</float>
<float>
16
83853456.4
3
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
This diff is collapsed.
Click to expand it.
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