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
daafd0e6
Commit
daafd0e6
authored
May 20, 2020
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP: Move all TypeProviders to ERP5Type Product.
parent
78a8f52c
Changes
20
Show whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
19 additions
and
22 deletions
+19
-22
bt5/erp5_banking_core/TestTemplateItem/portal_components/test.erp5.testERP5BankingAvailableInventory.py
...components/test.erp5.testERP5BankingAvailableInventory.py
+1
-1
product/ERP5/__init__.py
product/ERP5/__init__.py
+1
-2
product/ERP5/tests/testAccounting.py
product/ERP5/tests/testAccounting.py
+1
-1
product/ERP5/tests/testTemplate.py
product/ERP5/tests/testTemplate.py
+1
-1
product/ERP5Form/Document/Preference.py
product/ERP5Form/Document/Preference.py
+1
-1
product/ERP5Form/__init__.py
product/ERP5Form/__init__.py
+1
-2
product/ERP5Form/tests/testPreferences.py
product/ERP5Form/tests/testPreferences.py
+1
-1
product/ERP5OOo/tests/testDms.py
product/ERP5OOo/tests/testDms.py
+1
-1
product/ERP5OOo/tests/testOOoConversionServerRetry.py
product/ERP5OOo/tests/testOOoConversionServerRetry.py
+1
-1
product/ERP5Type/Core/DeliveryTypeInformation.py
product/ERP5Type/Core/DeliveryTypeInformation.py
+0
-0
product/ERP5Type/Core/PreferenceToolType.py
product/ERP5Type/Core/PreferenceToolType.py
+2
-2
product/ERP5Type/Core/PreferenceType.py
product/ERP5Type/Core/PreferenceType.py
+0
-0
product/ERP5Type/Core/SolverTypeInformation.py
product/ERP5Type/Core/SolverTypeInformation.py
+0
-0
product/ERP5Type/ERP5Site.py
product/ERP5Type/ERP5Site.py
+1
-1
product/ERP5Type/Tool/PreferenceTool.py
product/ERP5Type/Tool/PreferenceTool.py
+0
-5
product/ERP5Type/Tool/SolverTool.py
product/ERP5Type/Tool/SolverTool.py
+0
-0
product/ERP5Type/__init__.py
product/ERP5Type/__init__.py
+5
-2
product/ERP5Type/interfaces/__init__.py
product/ERP5Type/interfaces/__init__.py
+1
-0
product/ERP5Type/interfaces/delivery_solver_factory.py
product/ERP5Type/interfaces/delivery_solver_factory.py
+0
-0
product/ERP5Type/tests/ERP5TypeTestCase.py
product/ERP5Type/tests/ERP5TypeTestCase.py
+1
-1
No files found.
bt5/erp5_banking_core/TestTemplateItem/portal_components/test.erp5.testERP5BankingAvailableInventory.py
View file @
daafd0e6
...
@@ -37,7 +37,7 @@ from erp5.component.test.testERP5BankingCheckPayment \
...
@@ -37,7 +37,7 @@ from erp5.component.test.testERP5BankingCheckPayment \
import
TestERP5BankingCheckPaymentMixin
import
TestERP5BankingCheckPaymentMixin
from
erp5.component.test.testERP5BankingMoneyDeposit
\
from
erp5.component.test.testERP5BankingMoneyDeposit
\
import
TestERP5BankingMoneyDepositMixin
import
TestERP5BankingMoneyDepositMixin
from
Products.ERP5
Form
.PreferenceTool
import
Priority
from
Products.ERP5
Type.Tool
.PreferenceTool
import
Priority
# Needed in order to have a log file inside the current folder
# Needed in order to have a log file inside the current folder
os
.
environ
[
'EVENT_LOG_FILE'
]
=
os
.
path
.
join
(
os
.
getcwd
(),
'zLOG.log'
)
os
.
environ
[
'EVENT_LOG_FILE'
]
=
os
.
path
.
join
(
os
.
getcwd
(),
'zLOG.log'
)
...
...
product/ERP5/__init__.py
View file @
daafd0e6
...
@@ -45,7 +45,7 @@ from Tool import IdTool, TemplateTool,\
...
@@ -45,7 +45,7 @@ from Tool import IdTool, TemplateTool,\
TestTool
,
DomainTool
,
AlarmTool
,
\
TestTool
,
DomainTool
,
AlarmTool
,
\
TrashTool
,
ContributionTool
,
NotificationTool
,
PasswordTool
,
\
TrashTool
,
ContributionTool
,
NotificationTool
,
PasswordTool
,
\
GadgetTool
,
ContributionRegistryTool
,
IntrospectionTool
,
\
GadgetTool
,
ContributionRegistryTool
,
IntrospectionTool
,
\
AcknowledgementTool
,
SolverTool
,
\
AcknowledgementTool
,
\
UrlRegistryTool
,
InterfaceTool
,
\
UrlRegistryTool
,
InterfaceTool
,
\
CertificateAuthorityTool
,
InotifyTool
CertificateAuthorityTool
,
InotifyTool
from
Document
import
PythonScript
,
SQLMethod
from
Document
import
PythonScript
,
SQLMethod
...
@@ -65,7 +65,6 @@ portal_tools = ( IdTool.IdTool,
...
@@ -65,7 +65,6 @@ portal_tools = ( IdTool.IdTool,
ContributionRegistryTool
.
ContributionRegistryTool
,
ContributionRegistryTool
.
ContributionRegistryTool
,
IntrospectionTool
.
IntrospectionTool
,
IntrospectionTool
.
IntrospectionTool
,
AcknowledgementTool
.
AcknowledgementTool
,
AcknowledgementTool
.
AcknowledgementTool
,
SolverTool
.
SolverTool
,
UrlRegistryTool
.
UrlRegistryTool
,
UrlRegistryTool
.
UrlRegistryTool
,
CertificateAuthorityTool
.
CertificateAuthorityTool
,
CertificateAuthorityTool
.
CertificateAuthorityTool
,
InotifyTool
.
InotifyTool
,
InotifyTool
.
InotifyTool
,
...
...
product/ERP5/tests/testAccounting.py
View file @
daafd0e6
...
@@ -38,7 +38,7 @@ from Products.ERP5Type.tests.utils import reindex
...
@@ -38,7 +38,7 @@ from Products.ERP5Type.tests.utils import reindex
from
Products.DCWorkflow.DCWorkflow
import
ValidationFailed
from
Products.DCWorkflow.DCWorkflow
import
ValidationFailed
from
AccessControl.SecurityManagement
import
newSecurityManager
from
AccessControl.SecurityManagement
import
newSecurityManager
from
Products.ERP5Type.tests.Sequence
import
SequenceList
from
Products.ERP5Type.tests.Sequence
import
SequenceList
from
Products.ERP5
Form
.PreferenceTool
import
Priority
from
Products.ERP5
Type.Tool
.PreferenceTool
import
Priority
from
Products.ERP5Type.UnrestrictedMethod
import
UnrestrictedMethod
from
Products.ERP5Type.UnrestrictedMethod
import
UnrestrictedMethod
...
...
product/ERP5/tests/testTemplate.py
View file @
daafd0e6
...
@@ -33,7 +33,7 @@ import unittest
...
@@ -33,7 +33,7 @@ import unittest
from
unittest
import
expectedFailure
from
unittest
import
expectedFailure
from
AccessControl.SecurityManagement
import
newSecurityManager
from
AccessControl.SecurityManagement
import
newSecurityManager
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5
Form
.PreferenceTool
import
Priority
from
Products.ERP5
Type.Tool
.PreferenceTool
import
Priority
class
TestTemplate
(
ERP5TypeTestCase
):
class
TestTemplate
(
ERP5TypeTestCase
):
...
...
product/ERP5Form/Document/Preference.py
View file @
daafd0e6
...
@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo
...
@@ -31,7 +31,7 @@ from AccessControl import ClassSecurityInfo
from
Products.ERP5Type
import
Permissions
,
PropertySheet
,
Constraint
from
Products.ERP5Type
import
Permissions
,
PropertySheet
,
Constraint
from
Products.ERP5Type.Core.Folder
import
Folder
from
Products.ERP5Type.Core.Folder
import
Folder
from
Products.CMFCore.utils
import
getToolByName
from
Products.CMFCore.utils
import
getToolByName
from
Products.ERP5
Form
.PreferenceTool
import
PreferenceTool
from
Products.ERP5
Type.Tool
.PreferenceTool
import
PreferenceTool
class
Priority
:
class
Priority
:
""" names for priorities
""" names for priorities
...
...
product/ERP5Form/__init__.py
View file @
daafd0e6
...
@@ -47,7 +47,6 @@ import OOoChart, PDFTemplate, Report, PDFForm, ParallelListField
...
@@ -47,7 +47,6 @@ import OOoChart, PDFTemplate, Report, PDFForm, ParallelListField
import
PlanningBox
,
POSBox
,
FormBox
,
EditorField
,
ProxyField
,
DurationField
import
PlanningBox
,
POSBox
,
FormBox
,
EditorField
,
ProxyField
,
DurationField
import
RelationField
,
ImageField
,
MultiRelationField
,
MultiLinkField
,
InputButtonField
import
RelationField
,
ImageField
,
MultiRelationField
,
MultiLinkField
,
InputButtonField
import
CaptchaField
import
CaptchaField
import
PreferenceTool
from
Products.Formulator.FieldRegistry
import
FieldRegistry
from
Products.Formulator.FieldRegistry
import
FieldRegistry
from
Products.Formulator
import
StandardFields
,
HelperFields
from
Products.Formulator
import
StandardFields
,
HelperFields
...
@@ -56,7 +55,7 @@ from Products.CMFCore.utils import registerIcon
...
@@ -56,7 +55,7 @@ from Products.CMFCore.utils import registerIcon
object_classes
=
(
Form
.
ERP5Form
,
FSForm
.
ERP5FSForm
,
PDFTemplate
.
PDFTemplate
,
object_classes
=
(
Form
.
ERP5Form
,
FSForm
.
ERP5FSForm
,
PDFTemplate
.
PDFTemplate
,
Report
.
ERP5Report
,
PDFForm
.
PDFForm
)
Report
.
ERP5Report
,
PDFForm
.
PDFForm
)
portal_tools
=
(
SelectionTool
.
SelectionTool
,
PreferenceTool
.
PreferenceTool
)
portal_tools
=
(
SelectionTool
.
SelectionTool
,
)
content_classes
=
(
)
content_classes
=
(
)
content_constructors
=
()
content_constructors
=
()
...
...
product/ERP5Form/tests/testPreferences.py
View file @
daafd0e6
...
@@ -39,7 +39,7 @@ from DateTime import DateTime
...
@@ -39,7 +39,7 @@ from DateTime import DateTime
from
Products.ERP5Type.tests.testERP5Type
import
PropertySheetTestCase
from
Products.ERP5Type.tests.testERP5Type
import
PropertySheetTestCase
from
Products.ERP5Type.tests.utils
import
createZODBPythonScript
from
Products.ERP5Type.tests.utils
import
createZODBPythonScript
from
Products.ERP5
Form
.PreferenceTool
import
Priority
from
Products.ERP5
Type.Tool
.PreferenceTool
import
Priority
# should match what's configured by default in HtmlStylePreference
# should match what's configured by default in HtmlStylePreference
default_large_image_height
=
768
default_large_image_height
=
768
...
...
product/ERP5OOo/tests/testDms.py
View file @
daafd0e6
...
@@ -61,7 +61,7 @@ from Products.CMFCore.utils import getToolByName
...
@@ -61,7 +61,7 @@ from Products.CMFCore.utils import getToolByName
from
AccessControl.SecurityManagement
import
newSecurityManager
from
AccessControl.SecurityManagement
import
newSecurityManager
from
AccessControl
import
getSecurityManager
from
AccessControl
import
getSecurityManager
from
Products.ERP5.Document.Document
import
NotConvertedError
from
Products.ERP5.Document.Document
import
NotConvertedError
from
Products.ERP5
Form
.PreferenceTool
import
Priority
from
Products.ERP5
Type.Tool
.PreferenceTool
import
Priority
from
Products.ERP5Type.tests.utils
import
createZODBPythonScript
from
Products.ERP5Type.tests.utils
import
createZODBPythonScript
from
Products.ERP5Type.Globals
import
get_request
from
Products.ERP5Type.Globals
import
get_request
import
os
import
os
...
...
product/ERP5OOo/tests/testOOoConversionServerRetry.py
View file @
daafd0e6
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5OOo.tests.testDms
import
makeFileUpload
from
Products.ERP5OOo.tests.testDms
import
makeFileUpload
from
Products.ERP5
Form
.PreferenceTool
import
Priority
from
Products.ERP5
Type.Tool
.PreferenceTool
import
Priority
class
TestOOoConversionServerRetry
(
ERP5TypeTestCase
):
class
TestOOoConversionServerRetry
(
ERP5TypeTestCase
):
...
...
product/ERP5
/Document
/DeliveryTypeInformation.py
→
product/ERP5
Type/Core
/DeliveryTypeInformation.py
View file @
daafd0e6
File moved
product/ERP5
Form/Document
/PreferenceToolType.py
→
product/ERP5
Type/Core
/PreferenceToolType.py
View file @
daafd0e6
...
@@ -26,14 +26,14 @@
...
@@ -26,14 +26,14 @@
#
#
##############################################################################
##############################################################################
from
Products.ERP5
Form.Document
.PreferenceType
import
PreferenceType
from
Products.ERP5
Type.Core
.PreferenceType
import
PreferenceType
from
AccessControl
import
ClassSecurityInfo
from
AccessControl
import
ClassSecurityInfo
from
Products.ERP5Type
import
Permissions
from
Products.ERP5Type
import
Permissions
from
Products.ERP5Type.dynamic.accessor_holder
import
AccessorHolderType
from
Products.ERP5Type.dynamic.accessor_holder
import
AccessorHolderType
from
Products.ERP5Type.Accessor.TypeDefinition
import
list_types
from
Products.ERP5Type.Accessor.TypeDefinition
import
list_types
from
Products.ERP5Type.Utils
import
convertToUpperCase
from
Products.ERP5Type.Utils
import
convertToUpperCase
from
Products.ERP5
Form
.PreferenceTool
import
PreferenceMethod
from
Products.ERP5
Type.Tool
.PreferenceTool
import
PreferenceMethod
def
_generatePreferenceToolAccessorHolder
(
portal_type_name
,
def
_generatePreferenceToolAccessorHolder
(
portal_type_name
,
accessor_holder_list
):
accessor_holder_list
):
...
...
product/ERP5
Form/Document
/PreferenceType.py
→
product/ERP5
Type/Core
/PreferenceType.py
View file @
daafd0e6
File moved
product/ERP5
/Document
/SolverTypeInformation.py
→
product/ERP5
Type/Core
/SolverTypeInformation.py
View file @
daafd0e6
File moved
product/ERP5Type/ERP5Site.py
View file @
daafd0e6
...
@@ -299,7 +299,7 @@ class ERP5Site(ResponseHeaderGenerator, FolderMixIn, CMFSite, CacheCookieMixin):
...
@@ -299,7 +299,7 @@ class ERP5Site(ResponseHeaderGenerator, FolderMixIn, CMFSite, CacheCookieMixin):
if
pref
.
getPreferenceState
()
==
'global'
:
if
pref
.
getPreferenceState
()
==
'global'
:
break
break
else
:
else
:
from
Products.ERP5
Form
.PreferenceTool
import
Priority
from
Products.ERP5
Type.Tool
.PreferenceTool
import
Priority
pref
=
preference_tool
.
newContent
(
id
,
portal_type
,
pref
=
preference_tool
.
newContent
(
id
,
portal_type
,
priority
=
Priority
.
SITE
,
title
=
'Default '
+
portal_type
)
priority
=
Priority
.
SITE
,
title
=
'Default '
+
portal_type
)
pref
.
enable
()
pref
.
enable
()
...
...
product/ERP5
Form
/PreferenceTool.py
→
product/ERP5
Type/Tool
/PreferenceTool.py
View file @
daafd0e6
...
@@ -40,7 +40,6 @@ from Products.ERP5Type import Permissions
...
@@ -40,7 +40,6 @@ from Products.ERP5Type import Permissions
from
Products.ERP5Type.Cache
import
CachingMethod
from
Products.ERP5Type.Cache
import
CachingMethod
from
Products.ERP5Type.Utils
import
convertToUpperCase
from
Products.ERP5Type.Utils
import
convertToUpperCase
from
Products.ERP5Type.TransactionalVariable
import
getTransactionalVariable
from
Products.ERP5Type.TransactionalVariable
import
getTransactionalVariable
from
Products.ERP5Form
import
_dtmldir
from
BTrees.OIBTree
import
OIBTree
from
BTrees.OIBTree
import
OIBTree
_marker
=
object
()
_marker
=
object
()
...
@@ -105,10 +104,6 @@ class PreferenceTool(BaseTool):
...
@@ -105,10 +104,6 @@ class PreferenceTool(BaseTool):
aq_preference_generated
=
False
aq_preference_generated
=
False
security
.
declareProtected
(
Permissions
.
ManagePortal
,
'manage_overview'
)
manage_overview
=
DTMLFile
(
'explainPreferenceTool'
,
_dtmldir
)
security
.
declarePrivate
(
'manage_afterAdd'
)
security
.
declarePrivate
(
'manage_afterAdd'
)
def
manage_afterAdd
(
self
,
item
,
container
)
:
def
manage_afterAdd
(
self
,
item
,
container
)
:
""" init the permissions right after creation """
""" init the permissions right after creation """
...
...
product/ERP5/Tool/SolverTool.py
→
product/ERP5
Type
/Tool/SolverTool.py
View file @
daafd0e6
File moved
product/ERP5Type/__init__.py
View file @
daafd0e6
...
@@ -90,7 +90,8 @@ def initialize( context ):
...
@@ -90,7 +90,8 @@ def initialize( context ):
# Import Product Components
# Import Product Components
from
Tool
import
(
CacheTool
,
MemcachedTool
,
SessionTool
,
from
Tool
import
(
CacheTool
,
MemcachedTool
,
SessionTool
,
TypesTool
,
WebServiceTool
,
PropertySheetTool
,
TypesTool
,
WebServiceTool
,
PropertySheetTool
,
ComponentTool
,
CategoryTool
)
ComponentTool
,
CategoryTool
,
PreferenceTool
,
SolverTool
)
import
Document
import
Document
from
Base
import
Base
from
Base
import
Base
import
XMLObject
import
XMLObject
...
@@ -110,7 +111,9 @@ def initialize( context ):
...
@@ -110,7 +111,9 @@ def initialize( context ):
WebServiceTool
.
WebServiceTool
,
WebServiceTool
.
WebServiceTool
,
PropertySheetTool
.
PropertySheetTool
,
PropertySheetTool
.
PropertySheetTool
,
ComponentTool
.
ComponentTool
,
ComponentTool
.
ComponentTool
,
CategoryTool
.
CategoryTool
CategoryTool
.
CategoryTool
,
PreferenceTool
.
PreferenceTool
,
SolverTool
.
SolverTool
)
)
# Do initialization step
# Do initialization step
initializeProduct
(
context
,
this_module
,
globals
(),
initializeProduct
(
context
,
this_module
,
globals
(),
...
...
product/ERP5Type/interfaces/__init__.py
View file @
daafd0e6
...
@@ -12,3 +12,4 @@ from role_provider import ILocalRoleAssignor, ILocalRoleGenerator
...
@@ -12,3 +12,4 @@ from role_provider import ILocalRoleAssignor, ILocalRoleGenerator
from
types_tool
import
ITypesTool
,
ITypeProvider
from
types_tool
import
ITypesTool
,
ITypeProvider
from
property_recordable
import
IPropertyRecordable
from
property_recordable
import
IPropertyRecordable
from
predicate
import
IPredicate
from
predicate
import
IPredicate
from
delivery_solver_factory
import
IDeliverySolverFactory
product/ERP5/interfaces/delivery_solver_factory.py
→
product/ERP5
Type
/interfaces/delivery_solver_factory.py
View file @
daafd0e6
File moved
product/ERP5Type/tests/ERP5TypeTestCase.py
View file @
daafd0e6
...
@@ -59,7 +59,7 @@ from Testing.ZopeTestCase import PortalTestCase, user_name
...
@@ -59,7 +59,7 @@ from Testing.ZopeTestCase import PortalTestCase, user_name
from
Products.DCWorkflow.DCWorkflow
import
ValidationFailed
from
Products.DCWorkflow.DCWorkflow
import
ValidationFailed
from
Products.PythonScripts.PythonScript
import
PythonScript
from
Products.PythonScripts.PythonScript
import
PythonScript
from
Products.ERP5Type.Accessor.Constant
import
PropertyGetter
as
ConstantGetter
from
Products.ERP5Type.Accessor.Constant
import
PropertyGetter
as
ConstantGetter
from
Products.ERP5
Form
.PreferenceTool
import
Priority
from
Products.ERP5
Type.Tool
.PreferenceTool
import
Priority
from
zLOG
import
LOG
,
DEBUG
from
zLOG
import
LOG
,
DEBUG
from
Products.ERP5Type.Utils
import
convertToUpperCase
from
Products.ERP5Type.Utils
import
convertToUpperCase
from
Products.ERP5Type.tests.backportUnittest
import
SetupSiteError
from
Products.ERP5Type.tests.backportUnittest
import
SetupSiteError
...
...
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