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
1955ab6a
Commit
1955ab6a
authored
Nov 22, 2017
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_erp5: Update Conversion Server Constraint to use value from initsite (at zope.conf)
parent
0d311248
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
15 deletions
+6
-15
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/PreferenceTool_checkConversionServerConsistency.py
...s_erp5/PreferenceTool_checkConversionServerConsistency.py
+5
-15
master/bt5/slapos_erp5/bt/template_extension_id_list
master/bt5/slapos_erp5/bt/template_extension_id_list
+1
-0
No files found.
master/bt5/slapos_erp5/SkinTemplateItem/portal_skins/slapos_erp5/PreferenceTool_checkConversionServerConsistency.py
View file @
1955ab6a
...
...
@@ -7,26 +7,16 @@ if context.getPreferenceState() != "global":
portal
=
context
.
getPortalObject
()
system_preference
=
context
promise_url
=
portal
.
getPromiseParameter
(
'external_service'
,
'cloudooo_url'
)
expected_url
=
portal
.
ERP5Site_getConfigurationCloudoooUrl
(
)
if
promise_url
is
None
:
return
url
=
system_preference
.
getPreferredDocumentConversionServerUrl
()
url
=
"cloudooo://%s:%s/"
%
(
system_preference
.
getPreferredOoodocServerAddress
(),
system_preference
.
getPreferredOoodocServerPortNumber
())
if
promise_url
!=
url
:
if
expected_url
!=
url
:
fixing
=
''
if
fixit
:
domain_port
=
promise_url
.
split
(
'//'
)[
1
].
split
(
'/'
)[
0
]
port
=
domain_port
.
split
(
':'
)[
-
1
]
domain
=
domain_port
[:
-
(
len
(
port
)
+
1
)]
system_preference
.
edit
(
preferred_ooodoc_server_address
=
domain
,
preferred_ooodoc_server_port_number
=
port
,
)
system_preference
.
setPreferredDocumentConversionServerUrl
(
expected_url
)
fixing
=
' (fixed)'
return
[
"Conversion Server not configured as expected%s: %s"
%
(
fixing
,
"Expect %s
\
n
Got %s"
%
(
promise
_url
,
url
))]
(
fixing
,
"Expect %s
\
n
Got %s"
%
(
expected
_url
,
url
))]
else
:
return
[]
master/bt5/slapos_erp5/bt/template_extension_id_list
0 → 100644
View file @
1955ab6a
extension.erp5.SlapOSCheckConsistency
\ No newline at end of file
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