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
d54c8b06
Commit
d54c8b06
authored
Feb 15, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Use text_content for instance_xml and sets a default (if the user don' input)
parent
1b68e796
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/SoftwareRelease_requestHostingSubscription.py
..._json_style/SoftwareRelease_requestHostingSubscription.py
+7
-1
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/SoftwareRelease_requestHostingSubscription.xml
...json_style/SoftwareRelease_requestHostingSubscription.xml
+1
-1
No files found.
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/SoftwareRelease_requestHostingSubscription.py
View file @
d54c8b06
...
@@ -31,12 +31,18 @@ if person is None:
...
@@ -31,12 +31,18 @@ if person is None:
if
software_type
in
[
None
,
""
]:
if
software_type
in
[
None
,
""
]:
software_type
=
"RootSoftwareInstance"
software_type
=
"RootSoftwareInstance"
if
text_content
==
""
:
text_content
=
"""
<?xml version="1.0" encoding="utf-8" ?>
<instance>
</instance>"""
request_kw
=
{}
request_kw
=
{}
request_kw
.
update
(
request_kw
.
update
(
software_release
=
url
,
software_release
=
url
,
software_title
=
title
,
software_title
=
title
,
software_type
=
software_type
,
software_type
=
software_type
,
instance_xml
=
instance_xml
,
instance_xml
=
text_content
,
sla_xml
=
""
,
sla_xml
=
""
,
shared
=
shared
,
shared
=
shared
,
state
=
"started"
,
state
=
"started"
,
...
...
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/SoftwareRelease_requestHostingSubscription.xml
View file @
d54c8b06
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
_params
</string>
</key>
<key>
<string>
_params
</string>
</key>
<value>
<string>
title,
instance_xml
="", software_type=None, shared=False, computer_guid=None
</string>
</value>
<value>
<string>
title,
text_content
="", software_type=None, shared=False, computer_guid=None
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
id
</string>
</key>
<key>
<string>
id
</string>
</key>
...
...
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