Commit cf3c265a authored by Jim Fulton's avatar Jim Fulton

Fixed a bug that causes Draft objects to be undeleteable

as well as unusable with ZODB 3.
parent 862855b0
...@@ -149,7 +149,7 @@ class Draft(Persistent, Implicit, SimpleItem.Item): ...@@ -149,7 +149,7 @@ class Draft(Persistent, Implicit, SimpleItem.Item):
if name[-9:]=='__draft__': return getattr(self, name) if name[-9:]=='__draft__': return getattr(self, name)
try: db=self._jar.db() try: db=self._p_jar.db()
except: except:
# BoboPOS 2 # BoboPOS 2
jar=Globals.VersionBase[self._version].jar jar=Globals.VersionBase[self._version].jar
...@@ -168,7 +168,7 @@ class Draft(Persistent, Implicit, SimpleItem.Item): ...@@ -168,7 +168,7 @@ class Draft(Persistent, Implicit, SimpleItem.Item):
return getattr(self, name) return getattr(self, name)
def nonempty(self): def nonempty(self):
try: db=self._jar.db() try: db=self._p_jar.db()
except: except:
# BoboPOS 2 # BoboPOS 2
return Globals.VersionBase[self._version].nonempty() return Globals.VersionBase[self._version].nonempty()
...@@ -180,7 +180,7 @@ class Draft(Persistent, Implicit, SimpleItem.Item): ...@@ -180,7 +180,7 @@ class Draft(Persistent, Implicit, SimpleItem.Item):
def manage_Save__draft__(self, remark, REQUEST=None): def manage_Save__draft__(self, remark, REQUEST=None):
"""Make version changes permanent""" """Make version changes permanent"""
try: db=self._jar.db() try: db=self._p_jar.db()
except: except:
# BoboPOS 2 # BoboPOS 2
Globals.VersionBase[self._version].commit(remark) Globals.VersionBase[self._version].commit(remark)
...@@ -196,7 +196,7 @@ class Draft(Persistent, Implicit, SimpleItem.Item): ...@@ -196,7 +196,7 @@ class Draft(Persistent, Implicit, SimpleItem.Item):
def manage_Discard__draft__(self, REQUEST=None): def manage_Discard__draft__(self, REQUEST=None):
'Discard changes made during the version' 'Discard changes made during the version'
try: db=self._jar.db() try: db=self._p_jar.db()
except: except:
# BoboPOS 2 # BoboPOS 2
Globals.VersionBase[self._version].abort() Globals.VersionBase[self._version].abort()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment