[MERGE] forward port branch saas-11 up to 96fa86779b

2017-07-07 14:07:47 +02:00
parent c1e154bee1 96fa86779b
commit aef7748845
2 changed files with 5 additions and 2 deletions
@@ -224,7 +224,7 @@ class WorkflowItem(object):
                    transitions.append((transition['id'], self.workitem['inst_id']))

        if test and transitions:
-            cr.executemany('insert into wkf_witm_trans (trans_id,inst_id) values (%s,%s)', transitions)
+            cr.executemany('insert into wkf_witm_trans (trans_id,inst_id) values (%s,%s) except (select trans_id,inst_id from wkf_witm_trans)', transitions)
            cr.execute('delete from wkf_workitem where id=%s', (self.workitem['id'],))
            for t in transitions:
                self._join_test(t[0], t[1], stack)