# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1255596994 -7200
# Node ID 5d143781a6049daffe3ac13ee578f7374a18cfa6
# Parent  387d51af966dd34d9ba8fd3370439ed0cdb19496
fix merge

diff -r 387d51af966d -r 5d143781a604 devtools/fake.py
--- a/devtools/fake.py	Thu Oct 15 10:31:54 2009 +0200
+++ b/devtools/fake.py	Thu Oct 15 10:56:34 2009 +0200
@@ -47,8 +47,6 @@
         super(FakeRequest, self).__init__(*args, **kwargs)
         self._session_data = {}
         self._headers = {}
-        self.config = self.vreg.config
-        self.schema = self.vreg.schema
 
     def header_accept_language(self):
         """returns an ordered list of preferred languages"""
diff -r 387d51af966d -r 5d143781a604 entities/wfobjs.py
--- a/entities/wfobjs.py	Thu Oct 15 10:31:54 2009 +0200
+++ b/entities/wfobjs.py	Thu Oct 15 10:56:34 2009 +0200
@@ -418,10 +418,10 @@
         """return the default workflow for entities of this type"""
         # XXX CWEType method
         wfrset = self._cw.execute('Any WF WHERE ET default_workflow WF, '
-                                  'ET name %(et)s', {'et': self.id})
+                                  'ET name %(et)s', {'et': self.__regid__})
         if wfrset:
             return wfrset.get_entity(0, 0)
-        self.warning("can't find any workflow for %s", self.id)
+        self.warning("can't find any workflow for %s", self.__regid__)
         return None
 
     def possible_transitions(self, type='normal'):
diff -r 387d51af966d -r 5d143781a604 hooks/workflow.py
--- a/hooks/workflow.py	Thu Oct 15 10:31:54 2009 +0200
+++ b/hooks/workflow.py	Thu Oct 15 10:56:34 2009 +0200
@@ -106,7 +106,7 @@
             outputs.add(ep.subwf_state.eid)
 
 
-class _SubWorkflowExitOp(PreCommitOperation):
+class _SubWorkflowExitOp(hook.Operation):
 
     def precommit_event(self):
         session = self.session