Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix merge
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 15 Oct 2009 10:56:34 +0200
changeset 3675 5d143781a604
parent 3674 387d51af966d
child 3676 fa170564e1a0
fix merge
devtools/fake.py file | annotate | diff | comparison | revisions
entities/wfobjs.py file | annotate | diff | comparison | revisions
hooks/workflow.py file | annotate | diff | comparison | revisions 
--- 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"""
--- 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'):
--- 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
cubicweb