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
Nikola Balog
erp5
Commits
6c01f222
Commit
6c01f222
authored
Mar 17, 2017
by
Ayush Tiwari
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bt5_config: Remove old object only if sign is -1
parent
ded3605c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
product/ERP5/Document/BusinessManager.py
product/ERP5/Document/BusinessManager.py
+6
-4
No files found.
product/ERP5/Document/BusinessManager.py
View file @
6c01f222
...
@@ -716,10 +716,6 @@ class BusinessItem(Implicit, Persistent):
...
@@ -716,10 +716,6 @@ class BusinessItem(Implicit, Persistent):
container_url
=
'/'
.
join
(
container_path
)
container_url
=
'/'
.
join
(
container_path
)
old_obj
=
container
.
_getOb
(
object_id
,
None
)
old_obj
=
container
.
_getOb
(
object_id
,
None
)
# delete the old object before installing a new object
# delete the old object before installing a new object
if
old_obj
:
# XXX: In case there is an old object which has been modified from the
# older installation, then show the conflict status.
container
.
_delObject
(
object_id
)
# If sign is +1, set the new object on the container
# If sign is +1, set the new object on the container
if
self
.
_sign
==
1
:
if
self
.
_sign
==
1
:
# install object
# install object
...
@@ -732,6 +728,12 @@ class BusinessItem(Implicit, Persistent):
...
@@ -732,6 +728,12 @@ class BusinessItem(Implicit, Persistent):
del
obj
.
isIndexable
del
obj
.
isIndexable
if
getattr
(
aq_base
(
obj
),
'reindexObject'
,
None
)
is
not
None
:
if
getattr
(
aq_base
(
obj
),
'reindexObject'
,
None
)
is
not
None
:
obj
.
reindexObject
()
obj
.
reindexObject
()
else
:
# Only in case if sign is -1
if
old_obj
:
# XXX: In case there is an old object which has been modified from the
# older installation, then show the conflict status.
container
.
_delObject
(
object_id
)
def
unrestrictedResolveValue
(
self
,
context
=
None
,
path
=
''
,
default
=
_MARKER
,
def
unrestrictedResolveValue
(
self
,
context
=
None
,
path
=
''
,
default
=
_MARKER
,
restricted
=
0
):
restricted
=
0
):
...
...
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