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
Carlos Ramos Carreño
erp5
Commits
88ebd8cd
Commit
88ebd8cd
authored
Feb 06, 2020
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5Type.Base: Do not inherit from deprecated class.
parent
f247d3a3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
product/ERP5Type/Base.py
product/ERP5Type/Base.py
+7
-9
No files found.
product/ERP5Type/Base.py
View file @
88ebd8cd
...
...
@@ -49,8 +49,6 @@ from persistent import Persistent
from
persistent.TimeStamp
import
TimeStamp
from
zExceptions
import
NotFound
,
Unauthorized
from
ZopePatch
import
ERP5PropertyManager
from
Products.CMFCore.PortalContent
import
PortalContent
from
Products.CMFCore.Expression
import
Expression
from
Products.CMFCore.utils
import
getToolByName
,
_checkConditionalGET
,
_setCacheHeaders
,
_ViewEmulator
...
...
@@ -712,7 +710,7 @@ class Base( CopyContainer,
PortalContent
,
ActiveObject
,
OFS
.
History
.
Historical
,
ERP5
PropertyManager
,
PropertyManager
,
PropertyTranslatableBuiltInDictMixIn
,
JSONRepresentableMixin
,
):
...
...
@@ -1278,9 +1276,9 @@ class Base( CopyContainer,
result
=
[
result
]
return
result
if
d
is
not
_MARKER
:
return
ERP5
PropertyManager
.
getProperty
(
self
,
key
,
d
=
d
,
return
PropertyManager
.
getProperty
(
self
,
key
,
d
=
d
,
local_properties
=
True
,
**
kw
)
return
ERP5
PropertyManager
.
getProperty
(
self
,
key
,
return
PropertyManager
.
getProperty
(
self
,
key
,
local_properties
=
True
,
**
kw
)
security
.
declareProtected
(
Permissions
.
AccessContentsInformation
,
'getPropertyList'
)
...
...
@@ -1356,11 +1354,11 @@ class Base( CopyContainer,
# If we are here, this means we do not use a property that
# comes from an ERP5 PropertySheet, we should use the
# PropertyManager
if
ERP5
PropertyManager
.
hasProperty
(
self
,
key
,
local_properties
=
True
):
ERP5
PropertyManager
.
_updateProperty
(
self
,
key
,
value
,
if
PropertyManager
.
hasProperty
(
self
,
key
,
local_properties
=
True
):
PropertyManager
.
_updateProperty
(
self
,
key
,
value
,
local_properties
=
True
)
else
:
ERP5
PropertyManager
.
_setProperty
(
self
,
key
,
value
,
type
=
type
)
PropertyManager
.
_setProperty
(
self
,
key
,
value
,
type
=
type
)
# This should not be there, because this ignore all checks made by
# the PropertyManager. If there is problems, please complain to
# seb@nexedi.com
...
...
@@ -1390,7 +1388,7 @@ class Base( CopyContainer,
# Finaly use standard PropertyManager
#LOG("Changing attr: ",0, key)
#try:
ERP5
PropertyManager
.
_setPropValue
(
self
,
key
,
value
)
PropertyManager
.
_setPropValue
(
self
,
key
,
value
)
#except ConflictError:
# raise
# This should not be there, because this ignore all checks made by
...
...
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