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
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
slapos.core
Commits
d66ce607
Commit
d66ce607
authored
Mar 08, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Fix intent to support shared and sla
parent
bc2a8c17
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_intent_js.js
...em/web_page_module/rjs_gadget_erp5_page_slap_intent_js.js
+9
-3
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_intent_js.xml
...m/web_page_module/rjs_gadget_erp5_page_slap_intent_js.xml
+2
-2
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_intent_js.js
View file @
d66ce607
...
@@ -106,6 +106,9 @@
...
@@ -106,6 +106,9 @@
if
(
options
.
shared
)
{
if
(
options
.
shared
)
{
doc
.
shared
=
options
.
shared
;
doc
.
shared
=
options
.
shared
;
}
}
if
(
options
.
sla_xml
)
{
doc
.
sla_xml
=
options
.
sla_xml
;
}
return
gadget
.
notifySubmitting
()
return
gadget
.
notifySubmitting
()
.
push
(
function
()
{
.
push
(
function
()
{
var
query
=
[];
var
query
=
[];
...
@@ -115,11 +118,14 @@
...
@@ -115,11 +118,14 @@
query
.
push
(
"
software_type=
"
+
encodeURIComponent
(
doc
.
software_type
));
query
.
push
(
"
software_type=
"
+
encodeURIComponent
(
doc
.
software_type
));
}
}
if
(
doc
.
shared
)
{
if
(
doc
.
shared
)
{
query
.
push
(
"
shared=
"
+
encodeURIComponent
(
doc
.
shared
));
query
.
push
(
"
shared
:int
=
"
+
encodeURIComponent
(
doc
.
shared
));
}
}
if
(
doc
.
text_content
)
{
if
(
doc
.
text_content
)
{
query
.
push
(
"
text_content=
"
+
encodeURIComponent
(
doc
.
text_content
));
query
.
push
(
"
text_content=
"
+
encodeURIComponent
(
doc
.
text_content
));
}
}
if
(
doc
.
sla_xml
)
{
query
.
push
(
"
sla_xml=
"
+
encodeURIComponent
(
doc
.
sla_xml
));
}
return
gadget
.
jio_getAttachment
(
doc
.
relative_url
,
return
gadget
.
jio_getAttachment
(
doc
.
relative_url
,
url
+
doc
.
relative_url
+
"
/SoftwareRelease_requestHostingSubscription?
"
+
query
.
join
(
"
&
"
));
url
+
doc
.
relative_url
+
"
/SoftwareRelease_requestHostingSubscription?
"
+
query
.
join
(
"
&
"
));
})
})
...
@@ -128,7 +134,7 @@
...
@@ -128,7 +134,7 @@
.
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
"
:
key
,
"
page
"
:
"
slap_controller
"
}});
});
});
});
});
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_intent_js.xml
View file @
d66ce607
...
@@ -273,7 +273,7 @@
...
@@ -273,7 +273,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
965.437
49.35238.39116
</string>
</value>
<value>
<string>
965.437
54.24433.51490
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1519
310062.31
</float>
<float>
1519
405132.53
</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