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
Matevz Golob
erp5
Commits
7a140455
Commit
7a140455
authored
Jun 17, 2019
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BusinessTemplate,TrashTool: Do not trigger (un)indexation when preserving/trimming subobjects.
parent
9af75b60
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
product/ERP5/Document/BusinessTemplate.py
product/ERP5/Document/BusinessTemplate.py
+1
-1
product/ERP5/Tool/TrashTool.py
product/ERP5/Tool/TrashTool.py
+1
-1
No files found.
product/ERP5/Document/BusinessTemplate.py
View file @
7a140455
...
@@ -1487,7 +1487,7 @@ class ObjectTemplateItem(BaseTemplateItem):
...
@@ -1487,7 +1487,7 @@ class ObjectTemplateItem(BaseTemplateItem):
if
obj
.
_getOb
(
subobject_id
,
None
)
is
None
:
if
obj
.
_getOb
(
subobject_id
,
None
)
is
None
:
subobject_data
.
seek
(
0
)
subobject_data
.
seek
(
0
)
subobject
=
connection
.
importFile
(
subobject_data
)
subobject
=
connection
.
importFile
(
subobject_data
)
obj
.
_setObject
(
subobject_id
,
subobject
)
obj
.
_setObject
(
subobject_id
,
subobject
,
suppress_events
=
True
)
except
AttributeError
:
except
AttributeError
:
# XXX this may happen when an object which can contain
# XXX this may happen when an object which can contain
# sub-objects (e.g. ERP5 Form) has been replaced with
# sub-objects (e.g. ERP5 Form) has been replaced with
...
...
product/ERP5/Tool/TrashTool.py
View file @
7a140455
...
@@ -151,7 +151,7 @@ class TrashTool(BaseTool):
...
@@ -151,7 +151,7 @@ class TrashTool(BaseTool):
subobject
.
_p_oid
,
StringIO
())
subobject
.
_p_oid
,
StringIO
())
if
save
:
# remove subobjecs from backup object
if
save
:
# remove subobjecs from backup object
obj
.
_delObject
(
subobject_id
)
obj
.
_delObject
(
subobject_id
,
suppress_events
=
True
)
if
subobject_id
in
obj
.
objectIds
():
if
subobject_id
in
obj
.
objectIds
():
LOG
(
'Products.ERP5.Tool.TrashTool'
,
WARNING
,
LOG
(
'Products.ERP5.Tool.TrashTool'
,
WARNING
,
'Cleaning corrupted BTreeFolder2 object at %r.'
%
\
'Cleaning corrupted BTreeFolder2 object at %r.'
%
\
...
...
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