Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos
Commits
a72e960e
Commit
a72e960e
authored
Jul 28, 2011
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Post conversion coordinates when create the System Preference.
parent
91c9fe2e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
slapos/recipe/erp5/erp5.py
slapos/recipe/erp5/erp5.py
+7
-5
No files found.
slapos/recipe/erp5/erp5.py
View file @
a72e960e
...
@@ -190,13 +190,13 @@ class ERP5Updater(object):
...
@@ -190,13 +190,13 @@ class ERP5Updater(object):
"activate"
:
1
,
"activate"
:
1
,
"install_dependency"
:
1
})
"install_dependency"
:
1
})
def
_createActiveSystemPreference
(
self
):
def
_createActiveSystemPreference
(
self
,
edit_kw
=
{}
):
""" Assert that at least one enabled System Preference is present on
""" Assert that at least one enabled System Preference is present on
the erp5 instance.
the erp5 instance.
"""
"""
self
.
log
(
"INFO"
,
"Try to create New System Preference into ERP5!"
)
self
.
log
(
"INFO"
,
"Try to create New System Preference into ERP5!"
)
path
=
"/%s/portal_preferences/createActiveSystemPreference"
%
self
.
site_id
path
=
"/%s/portal_preferences/createActiveSystemPreference"
%
self
.
site_id
status
,
data
=
self
.
POST
(
path
,
{}
)
status
,
data
=
self
.
POST
(
path
,
edit_kw
)
if
status
!=
200
:
if
status
!=
200
:
self
.
log
(
"ERROR"
,
"Unable to create System Preference, an error ocurred %s."
%
data
)
self
.
log
(
"ERROR"
,
"Unable to create System Preference, an error ocurred %s."
%
data
)
...
@@ -216,15 +216,17 @@ class ERP5Updater(object):
...
@@ -216,15 +216,17 @@ class ERP5Updater(object):
if
None
in
[
host_key
,
port_key
]:
if
None
in
[
host_key
,
port_key
]:
self
.
log
(
"ERROR"
,
"Unable to find the Active System Preference to Update!"
)
self
.
log
(
"ERROR"
,
"Unable to find the Active System Preference to Update!"
)
self
.
_createActiveSystemPreference
()
self
.
_createActiveSystemPreference
(
{
"preferred_ooodoc_server_address"
:
self
.
conversion_server_address
,
"preferred_ooodoc_server_port_number"
:
self
.
conversion_server_port
})
return
True
return
True
is_updated
=
self
.
_assertAndUpdateDocument
(
host_key
,
self
.
conversion_server_address
,
is_updated
=
self
.
_assertAndUpdateDocument
(
host_key
,
self
.
conversion_server_address
,
"setPreferredOoodocServerAddress"
)
"setPreferredOoodocServerAddress"
)
is_updated
=
is_updated
or
self
.
_assertAndUpdateDocument
(
port_key
,
is_updated
=
self
.
_assertAndUpdateDocument
(
port_key
,
self
.
conversion_server_port
,
self
.
conversion_server_port
,
"setPreferredOoodocServerPortNumber"
)
"setPreferredOoodocServerPortNumber"
)
or
is_updated
return
is_updated
return
is_updated
...
...
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