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
Labels
Merge Requests
19
Merge Requests
19
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
nexedi
slapos.core
Commits
09b522b4
Commit
09b522b4
authored
Jul 22, 2022
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio_api_style: Fix typo on root_instance_title
parent
82a8d43f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
master/bt5/slapos_jio_api_style/PathTemplateItem/portal_callables/SoftwareInstance_getFromJSON.xml
...ateItem/portal_callables/SoftwareInstance_getFromJSON.xml
+1
-1
master/bt5/slapos_jio_api_style/PathTemplateItem/portal_callables/jIOWebSection_searchInstanceFromJSON.xml
...portal_callables/jIOWebSection_searchInstanceFromJSON.xml
+2
-2
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_searchInstance.py
...rtal_skins/slapos_jio_api/jIOWebSection_searchInstance.py
+4
-4
No files found.
master/bt5/slapos_jio_api_style/PathTemplateItem/portal_callables/SoftwareInstance_getFromJSON.xml
View file @
09b522b4
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
<item>
<item>
<key>
<string>
output_schema
</string>
</key>
<key>
<string>
output_schema
</string>
</key>
<value>
<string>
{\n
<value>
<string>
{\n
"
title": "bar
"\n
"
$ref: "%(base_url)s/portal_types/Software%20Instance/getTextContent
"\n
}
</string>
</value>
}
</string>
</value>
</item>
</item>
<item>
<item>
...
...
master/bt5/slapos_jio_api_style/PathTemplateItem/portal_callables/jIOWebSection_searchInstanceFromJSON.xml
View file @
09b522b4
...
@@ -105,7 +105,7 @@
...
@@ -105,7 +105,7 @@
"type": "string",\n
"type": "string",\n
"description": "The Id of the compute node hosting the instance, example: COMP-1234"\n
"description": "The Id of the compute node hosting the instance, example: COMP-1234"\n
},\n
},\n
"root_instan
t
e_title": {\n
"root_instan
c
e_title": {\n
"title": "Root Instance Title",\n
"title": "Root Instance Title",\n
"type": "string",\n
"type": "string",\n
"description": "Title of the Instance at the root of the instance tree. This is the title of the instance that has been requested by the user."\n
"description": "Title of the Instance at the root of the instance tree. This is the title of the instance that has been requested by the user."\n
...
@@ -131,7 +131,7 @@
...
@@ -131,7 +131,7 @@
"type": "string",\n
"type": "string",\n
"description": "Reference of the Instance where this is instance is hosted, usefull for shared instances"\n
"description": "Reference of the Instance where this is instance is hosted, usefull for shared instances"\n
},\n
},\n
"root_instan
t
e_title": {\n
"root_instan
c
e_title": {\n
"title": "Root Instance Title",\n
"title": "Root Instance Title",\n
"type": "string",\n
"type": "string",\n
"description": "Title of the Instance at the root of the instance tree. This is the title of the instance that has been requested by the user."\n
"description": "Title of the Instance at the root of the instance tree. This is the title of the instance that has been requested by the user."\n
...
...
master/bt5/slapos_jio_api_style/SkinTemplateItem/portal_skins/slapos_jio_api/jIOWebSection_searchInstance.py
View file @
09b522b4
...
@@ -18,8 +18,8 @@ if portal_type == "Software Instance":
...
@@ -18,8 +18,8 @@ if portal_type == "Software Instance":
search_kw
[
"title"
]
=
data_dict
[
"title"
]
search_kw
[
"title"
]
=
data_dict
[
"title"
]
if
"compute_node_id"
in
data_dict
:
if
"compute_node_id"
in
data_dict
:
search_kw
[
"aggregate_parent_reference"
]
=
data_dict
[
"compute_node_id"
]
search_kw
[
"aggregate_parent_reference"
]
=
data_dict
[
"compute_node_id"
]
if
"root_instan
t
e_title"
in
data_dict
:
if
"root_instan
c
e_title"
in
data_dict
:
search_kw
[
"strict_specialise_title"
]
=
data_dict
[
"root_instan
t
e_title"
]
search_kw
[
"strict_specialise_title"
]
=
data_dict
[
"root_instan
c
e_title"
]
result_list
=
[{
result_list
=
[{
"title"
:
x
.
title
,
"title"
:
x
.
title
,
...
@@ -49,8 +49,8 @@ elif portal_type == "Shared Instance":
...
@@ -49,8 +49,8 @@ elif portal_type == "Shared Instance":
error_code
=
404
error_code
=
404
)
)
search_kw
[
"strict_aggregate_uid"
]
=
host_instance_list
[
0
].
getObject
().
getAggregateUid
()
search_kw
[
"strict_aggregate_uid"
]
=
host_instance_list
[
0
].
getObject
().
getAggregateUid
()
if
"root_instan
t
e_title"
in
data_dict
:
if
"root_instan
c
e_title"
in
data_dict
:
search_kw
[
"strict_specialise_title"
]
=
data_dict
[
"root_instan
t
e_title"
]
search_kw
[
"strict_specialise_title"
]
=
data_dict
[
"root_instan
c
e_title"
]
#return portal.portal_catalog(src__=1, **search_kw)
#return portal.portal_catalog(src__=1, **search_kw)
result_list
=
[{
result_list
=
[{
"title"
:
x
.
title
,
"title"
:
x
.
title
,
...
...
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