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
Yusei Tahara
erp5
Commits
31d74297
Commit
31d74297
authored
Jul 03, 2017
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Site: get rid of *_sql_connection_type properties
parent
f283aac1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
32 deletions
+2
-32
product/ERP5/ERP5Site.py
product/ERP5/ERP5Site.py
+2
-32
No files found.
product/ERP5/ERP5Site.py
View file @
31d74297
...
@@ -69,12 +69,7 @@ def manage_addERP5Site(self,
...
@@ -69,12 +69,7 @@ def manage_addERP5Site(self,
email_from_name
=
'Portal Administrator'
,
email_from_name
=
'Portal Administrator'
,
validate_email
=
0
,
validate_email
=
0
,
erp5_catalog_storage
=
''
,
erp5_catalog_storage
=
''
,
erp5_sql_connection_type
=
'Z MySQL Database Connection'
,
erp5_sql_connection_string
=
'test test'
,
erp5_sql_connection_string
=
'test test'
,
erp5_sql_deferred_connection_type
=
\
'Z MySQL Deferred Database Connection'
,
cmf_activity_sql_connection_type
=
\
'Z MySQL Database Connection'
,
cmf_activity_sql_connection_string
=
'test test'
,
cmf_activity_sql_connection_string
=
'test test'
,
light_install
=
0
,
light_install
=
0
,
reindex
=
1
,
reindex
=
1
,
...
@@ -88,10 +83,7 @@ def manage_addERP5Site(self,
...
@@ -88,10 +83,7 @@ def manage_addERP5Site(self,
id
,
id
,
create_userfolder
,
create_userfolder
,
erp5_catalog_storage
,
erp5_catalog_storage
,
erp5_sql_connection_type
,
erp5_sql_connection_string
,
erp5_sql_connection_string
,
erp5_sql_deferred_connection_type
,
cmf_activity_sql_connection_type
,
cmf_activity_sql_connection_string
,
cmf_activity_sql_connection_string
,
create_activities
=
create_activities
,
create_activities
=
create_activities
,
light_install
=
light_install
,
light_install
=
light_install
,
...
@@ -1848,10 +1840,7 @@ class ERP5Generator(PortalGenerator):
...
@@ -1848,10 +1840,7 @@ class ERP5Generator(PortalGenerator):
id
,
id
,
create_userfolder
,
create_userfolder
,
erp5_catalog_storage
,
erp5_catalog_storage
,
erp5_sql_connection_type
,
erp5_sql_connection_string
,
erp5_sql_connection_string
,
erp5_sql_deferred_connection_type
,
cmf_activity_sql_connection_type
,
cmf_activity_sql_connection_string
,
cmf_activity_sql_connection_string
,
create_activities
=
True
,
create_activities
=
True
,
reindex
=
1
,
reindex
=
1
,
...
@@ -1875,16 +1864,10 @@ class ERP5Generator(PortalGenerator):
...
@@ -1875,16 +1864,10 @@ class ERP5Generator(PortalGenerator):
erp5_sql_deferred_connection_string
=
erp5_sql_connection_string
erp5_sql_deferred_connection_string
=
erp5_sql_connection_string
p
.
_setProperty
(
'erp5_catalog_storage'
,
p
.
_setProperty
(
'erp5_catalog_storage'
,
erp5_catalog_storage
,
'string'
)
erp5_catalog_storage
,
'string'
)
p
.
_setProperty
(
'erp5_sql_connection_type'
,
erp5_sql_connection_type
,
'string'
)
p
.
_setProperty
(
'erp5_sql_connection_string'
,
p
.
_setProperty
(
'erp5_sql_connection_string'
,
erp5_sql_connection_string
,
'string'
)
erp5_sql_connection_string
,
'string'
)
p
.
_setProperty
(
'erp5_sql_deferred_connection_type'
,
erp5_sql_deferred_connection_type
,
'string'
)
p
.
_setProperty
(
'erp5_sql_deferred_connection_string'
,
p
.
_setProperty
(
'erp5_sql_deferred_connection_string'
,
erp5_sql_deferred_connection_string
,
'string'
)
erp5_sql_deferred_connection_string
,
'string'
)
p
.
_setProperty
(
'cmf_activity_sql_connection_type'
,
cmf_activity_sql_connection_type
,
'string'
)
p
.
_setProperty
(
'cmf_activity_sql_connection_string'
,
p
.
_setProperty
(
'cmf_activity_sql_connection_string'
,
cmf_activity_sql_connection_string
,
'string'
)
cmf_activity_sql_connection_string
,
'string'
)
p
.
_setProperty
(
'management_page_charset'
,
'UTF-8'
,
'string'
)
p
.
_setProperty
(
'management_page_charset'
,
'UTF-8'
,
'string'
)
...
@@ -1984,20 +1967,16 @@ class ERP5Generator(PortalGenerator):
...
@@ -1984,20 +1967,16 @@ class ERP5Generator(PortalGenerator):
if
not
p
.
hasObject
(
'portal_catalog'
):
if
not
p
.
hasObject
(
'portal_catalog'
):
addTool
(
'ERP5 Catalog'
,
None
)
addTool
(
'ERP5 Catalog'
,
None
)
if
1
:
# Add Default SQL connection
# Add Default SQL connection
if
p
.
erp5_sql_connection_type
==
'Z MySQL Database Connection'
:
if
not
p
.
hasObject
(
'erp5_sql_connection'
):
if
not
p
.
hasObject
(
'erp5_sql_connection'
):
addSQLConnection
=
p
.
manage_addProduct
[
'ZMySQLDA'
].
\
addSQLConnection
=
p
.
manage_addProduct
[
'ZMySQLDA'
].
\
manage_addZMySQLConnection
manage_addZMySQLConnection
addSQLConnection
(
'erp5_sql_connection'
,
addSQLConnection
(
'erp5_sql_connection'
,
'ERP5 SQL Server Connection'
,
'ERP5 SQL Server Connection'
,
p
.
erp5_sql_connection_string
)
p
.
erp5_sql_connection_string
)
elif
p
.
erp5_sql_connection_type
==
'Z Gadfly'
:
pass
# Add Deferred SQL Connections
# Add Deferred SQL Connections
if
p
.
erp5_sql_deferred_connection_type
==
\
'Z MySQL Deferred Database Connection'
:
if
not
p
.
hasObject
(
'erp5_sql_deferred_connection'
):
if
not
p
.
hasObject
(
'erp5_sql_deferred_connection'
):
addSQLConnection
=
p
.
manage_addProduct
[
'ZMySQLDA'
].
\
addSQLConnection
=
p
.
manage_addProduct
[
'ZMySQLDA'
].
\
manage_addZMySQLConnection
manage_addZMySQLConnection
...
@@ -2005,11 +1984,8 @@ class ERP5Generator(PortalGenerator):
...
@@ -2005,11 +1984,8 @@ class ERP5Generator(PortalGenerator):
'ERP5 SQL Server Deferred Connection'
,
'ERP5 SQL Server Deferred Connection'
,
p
.
erp5_sql_deferred_connection_string
,
p
.
erp5_sql_deferred_connection_string
,
deferred
=
True
)
deferred
=
True
)
elif
p
.
erp5_sql_deferred_connection_type
==
'Z Gadfly'
:
pass
# Add Activity SQL Connections
# Add Activity SQL Connections
if
p
.
cmf_activity_sql_connection_type
==
'Z MySQL Database Connection'
:
if
not
p
.
hasObject
(
'cmf_activity_sql_connection'
):
if
not
p
.
hasObject
(
'cmf_activity_sql_connection'
):
addSQLConnection
=
p
.
manage_addProduct
[
'CMFActivity'
].
\
addSQLConnection
=
p
.
manage_addProduct
[
'CMFActivity'
].
\
manage_addActivityConnection
manage_addActivityConnection
...
@@ -2028,8 +2004,6 @@ class ERP5Generator(PortalGenerator):
...
@@ -2028,8 +2004,6 @@ class ERP5Generator(PortalGenerator):
addSQLConnection
(
'erp5_sql_transactionless_connection'
,
addSQLConnection
(
'erp5_sql_transactionless_connection'
,
'ERP5 Transactionless SQL Server Connection'
,
'ERP5 Transactionless SQL Server Connection'
,
'-%s'
%
p
.
cmf_activity_sql_connection_string
)
'-%s'
%
p
.
cmf_activity_sql_connection_string
)
elif
p
.
cmf_activity_sql_connection_type
==
'Z Gadfly'
:
pass
# Add ERP5Form Tools
# Add ERP5Form Tools
addERP5Tool
(
p
,
'portal_selections'
,
'Selection Tool'
)
addERP5Tool
(
p
,
'portal_selections'
,
'Selection Tool'
)
...
@@ -2149,11 +2123,7 @@ class ERP5Generator(PortalGenerator):
...
@@ -2149,11 +2123,7 @@ class ERP5Generator(PortalGenerator):
def
setupIndex
(
self
,
p
,
**
kw
):
def
setupIndex
(
self
,
p
,
**
kw
):
# Make sure all tools and folders have been indexed
# Make sure all tools and folders have been indexed
if
not
kw
.
get
(
'reindex'
,
1
):
if
kw
.
get
(
'reindex'
,
1
):
return
# When no SQL connection was define on the site,
# we don't want to make it crash
if
p
.
erp5_sql_connection_type
is
not
None
:
setattr
(
p
,
'isIndexable'
,
ConstantGetter
(
'isIndexable'
,
value
=
True
))
setattr
(
p
,
'isIndexable'
,
ConstantGetter
(
'isIndexable'
,
value
=
True
))
# Clear portal ids sql table, like this we do not take
# Clear portal ids sql table, like this we do not take
# ids for a previously created web site
# ids for a previously created web site
...
...
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