Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Xavier Thompson
erp5
Commits
bd9a20b6
Commit
bd9a20b6
authored
Aug 10, 2017
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wip
parent
2cf95f9e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
65 additions
and
3 deletions
+65
-3
product/ERP5/ERP5Site.py
product/ERP5/ERP5Site.py
+64
-2
product/ZMySQLDA/db.py
product/ZMySQLDA/db.py
+1
-1
No files found.
product/ERP5/ERP5Site.py
View file @
bd9a20b6
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
import
threading
import
threading
from
weakref
import
ref
as
weakref
from
weakref
import
ref
as
weakref
from
OFS.Application
import
Application
from
OFS.Application
import
Application
,
AppInitializer
from
Products.ERP5Type
import
Globals
from
Products.ERP5Type
import
Globals
from
Products.ERP5Type.Globals
import
package_home
from
Products.ERP5Type.Globals
import
package_home
...
@@ -68,7 +68,7 @@ def manage_addERP5Site(self,
...
@@ -68,7 +68,7 @@ def manage_addERP5Site(self,
email_from_address
=
'postmaster@localhost'
,
email_from_address
=
'postmaster@localhost'
,
email_from_name
=
'Portal Administrator'
,
email_from_name
=
'Portal Administrator'
,
validate_email
=
0
,
validate_email
=
0
,
erp5_catalog_storage
=
''
,
erp5_catalog_storage
=
'
erp5_mysql_innodb_catalog
'
,
erp5_sql_connection_string
=
'test test'
,
erp5_sql_connection_string
=
'test test'
,
cmf_activity_sql_connection_string
=
'test test'
,
cmf_activity_sql_connection_string
=
'test test'
,
light_install
=
0
,
light_install
=
0
,
...
@@ -2281,3 +2281,65 @@ class ERP5Generator(PortalGenerator):
...
@@ -2281,3 +2281,65 @@ class ERP5Generator(PortalGenerator):
template_tool
.
installBusinessTemplateListFromRepository
(
template_tool
.
installBusinessTemplateListFromRepository
(
[
'erp5_promise'
],
activate
=
True
,
install_dependency
=
True
)
[
'erp5_promise'
],
activate
=
True
,
install_dependency
=
True
)
p
.
portal_alarms
.
subscribe
()
p
.
portal_alarms
.
subscribe
()
# Zope offers no mechanism to extend AppInitializer so let's monkey-patch.
AppInitializer_initialize
=
AppInitializer
.
initialize
def
initialize
(
self
):
AppInitializer
.
initialize
=
AppInitializer_initialize
.
__func__
self
.
initialize
()
try
:
kw
=
getConfiguration
().
product_config
[
'initsite'
]
except
KeyError
:
return
meta_type
=
ERP5Site
.
meta_type
for
_
in
self
.
getApp
().
objectIds
(
meta_type
):
return
# We defer the call to manage_addERP5Site via ZServer.PubCore because:
# - we use ZPublisher so that get_request() works
# (see new_publish in Localizer.patches)
# - we want errors to be logged correctly
# (see Zope2.zpublisher_exception_hook in Zope2.App.startup)
from
AccessControl.SecurityManagement
import
newSecurityManager
from
cStringIO
import
StringIO
from
inspect
import
getcallargs
from
Products.ZMySQLDA.db
import
DB
from
ZPublisher
import
HTTPRequest
,
HTTPResponse
from
ZServer.PubCore
import
handle
def
addERP5Site
():
default_kw
=
getcallargs
(
manage_addERP5Site
,
None
,
''
)
# The lock is to avoid that multiple zopes try to create a site when
# they're started at the same time, because this is a quite long operation
# (-> high probably of conflict with a lot of wasted CPU).
# Theoretically, the same precaution should be taken for previous initial
# commits, but they're small operations. At worst, SlapOS restarts zopes
# automatically.
# A ZODB lock would be better but unless we extend ZODB, this is only
# possible with NEO, by voting a change to oid 0 in a parallel transaction
# (and abort at the end): thanks to locking at object-level, this would not
# block the main transaction.
with
DB
(
kw
.
get
(
'erp5_sql_connection_string'
)
or
default_kw
[
'erp5_sql_connection_string'
]).
lock
():
transaction
.
begin
()
app
=
request
[
'PARENTS'
][
0
]
=
request
[
'PARENTS'
][
0
]()
for
_
in
app
.
objectIds
(
meta_type
):
return
uf
=
app
.
acl_users
user
=
uf
.
getUser
(
kw
.
pop
(
'owner'
))
if
not
user
.
has_role
(
'Manager'
):
response
.
unauthorized
()
newSecurityManager
(
None
,
user
.
__of__
(
uf
))
manage_addERP5Site
(
app
.
__of__
(
RequestContainer
(
REQUEST
=
request
)),
**
{
k
:
kw
.
get
(
k
,
v
)
for
k
,
v
in
default_kw
.
iteritems
()
if
isinstance
(
v
,
str
)})
transaction
.
get
().
note
(
'Created '
+
meta_type
)
transaction
.
commit
()
response
=
HTTPResponse
.
HTTPResponse
(
stdout
=
StringIO
())
response
.
_finish
=
lambda
:
None
request
=
HTTPRequest
.
HTTPRequest
(
StringIO
(),
dict
(
REQUEST_METHOD
=
'GET'
,
SERVER_URL
=
''
),
response
)
request
.
traverse
=
lambda
*
args
,
**
kw
:
addERP5Site
handle
(
'Zope2'
,
request
,
response
)
AppInitializer
.
initialize
=
initialize
product/ZMySQLDA/db.py
View file @
bd9a20b6
...
@@ -492,7 +492,7 @@ class DB(TM):
...
@@ -492,7 +492,7 @@ class DB(TM):
if m is None:
if m is None:
return
return
name = m.group(2)
name = m.group(2)
#
Lock automaticaly unless src__ is True,
because the caller may have
#
Do not lock automatically if src__ is True
because the caller may have
# already done it (in case that it plans to execute the returned query).
# already done it (in case that it plans to execute the returned query).
with (nested if src__ else self.lock)():
with (nested if src__ else self.lock)():
try:
try:
...
...
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