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
Paul Graydon
slapos.core
Commits
66fb8bfa
Commit
66fb8bfa
authored
Sep 30, 2024
by
Romain Courteaud
🐙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_panel: encode json string to use UTF-8
parent
25218aea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceTree_getMonitorParameterDict.py
...kins/slapos_panel/InstanceTree_getMonitorParameterDict.py
+5
-3
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SoftwareInstance_getConnectionParameterList.py
...apos_panel/SoftwareInstance_getConnectionParameterList.py
+4
-2
No files found.
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/InstanceTree_getMonitorParameterDict.py
View file @
66fb8bfa
from
Products.ERP5Type.Utils
import
unicode2str
def
getCredentialFromUrl
(
url_string
):
username
=
password
=
url
=
''
param_list
=
url_string
.
split
(
'#'
)
...
...
@@ -44,7 +46,7 @@ else:
return
{}
return
{
'username'
:
u
sername
,
'password'
:
password
,
'url'
:
u
rl
'username'
:
u
nicode2str
(
username
)
,
'password'
:
unicode2str
(
password
)
,
'url'
:
u
nicode2str
(
url
)
}
master/bt5/slapos_panel/SkinTemplateItem/portal_skins/slapos_panel/SoftwareInstance_getConnectionParameterList.py
View file @
66fb8bfa
from
Products.ERP5Type.Document
import
newTempBase
from
Products.ERP5Type.Utils
import
unicode2str
import
json
return_list
=
[]
...
...
@@ -21,9 +23,9 @@ if relative_url == None:
for
k
in
sorted
(
connection_dict
):
if
raw
:
d
=
{
"connection_key"
:
k
,
"connection_value"
:
connection_dict
[
k
]
}
d
=
{
"connection_key"
:
k
,
"connection_value"
:
unicode2str
(
connection_dict
[
k
])
}
else
:
d
=
newTempBase
(
portal
,
relative_url
)
d
.
edit
(
connection_key
=
k
,
connection_value
=
connection_dict
[
k
]
)
d
.
edit
(
connection_key
=
k
,
connection_value
=
unicode2str
(
connection_dict
[
k
])
)
return_list
.
append
(
d
)
return
return_list
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