# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1258982033 -3600
# Node ID 92ead039d3d0f5d0ccd941550ed7575d88d8914c
# Parent  c53df9a310a6c4cbb4e0d31b718474419f5159ce# Parent  27cbf98ad86389ac13b66fe655b9bfcd1f96de77
merge

diff -r c53df9a310a6 -r 92ead039d3d0 hooks/integrity.py
--- a/hooks/integrity.py	Fri Nov 20 23:44:57 2009 +0100
+++ b/hooks/integrity.py	Mon Nov 23 14:13:53 2009 +0100
@@ -93,10 +93,7 @@
             # skip automatically handled relations
             if rschema.type in DONT_CHECK_RTYPES_ON_ADD:
                 continue
-            if role == 'subject':
-                opcls = _CheckSRelationOp
-            else:
-                opcls = _CheckORelationOp
+            opcls = role == 'subject' and _CheckSRelationOp or _CheckORelationOp
             rdef = rschema.role_rdef(eschema, targetschemas[0], role)
             if rdef.role_cardinality(role) in '1+':
                 self.checkrel_if_necessary(opcls, rschema.type, eid)
diff -r c53df9a310a6 -r 92ead039d3d0 hooks/workflow.py
--- a/hooks/workflow.py	Fri Nov 20 23:44:57 2009 +0100
+++ b/hooks/workflow.py	Mon Nov 23 14:13:53 2009 +0100
@@ -202,8 +202,8 @@
         try:
             treid = entity['by_transition']
         except KeyError:
-            # no transition set, check user is a manager and destination state is
-            # specified (and valid)
+            # no transition set, check user is a manager and destination state
+            # is specified (and valid)
             if not cowpowers:
                 msg = session._('mandatory relation')
                 raise ValidationError(entity.eid, {'by_transition': msg})
@@ -216,8 +216,8 @@
                 msg = session._("state doesn't belong to entity's workflow")
                 raise ValidationError(entity.eid, {'to_state': msg})
         else:
-            # check transition is valid and allowed, unless we're coming back from
-            # subworkflow
+            # check transition is valid and allowed, unless we're coming back
+            # from subworkflow
             tr = session.entity_from_eid(treid)
             if swtr is None:
                 if tr is None: