Index: openacs-4/packages/simulation/lib/sim-template-roles.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/lib/sim-template-roles.tcl,v diff -u -r1.14.2.3 -r1.14.2.4 --- openacs-4/packages/simulation/lib/sim-template-roles.tcl 19 Dec 2006 15:34:02 -0000 1.14.2.3 +++ openacs-4/packages/simulation/lib/sim-template-roles.tcl 15 Feb 2007 14:01:31 -0000 1.14.2.4 @@ -96,7 +96,7 @@ from workflow_roles wr, sim_roles sr left join cr_items ci on (sr.character_id = ci.item_id) - join sim_charactersx sc on (ci.item_id = sc.item_id + left join sim_charactersx sc on (ci.item_id = sc.item_id and ci.live_revision = sc.object_id) where wr.workflow_id = :workflow_id and wr.role_id = sr.role_id Index: openacs-4/packages/simulation/tcl/character-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/simulation/tcl/character-procs.tcl,v diff -u -r1.3.2.2 -r1.3.2.3 --- openacs-4/packages/simulation/tcl/character-procs.tcl 2 Nov 2006 10:44:12 -0000 1.3.2.2 +++ openacs-4/packages/simulation/tcl/character-procs.tcl 15 Feb 2007 14:01:32 -0000 1.3.2.3 @@ -22,10 +22,11 @@ db_1row select_character_info { select sc.*, cr.title, cr.description - from sim_characters sc, cr_revisions cr, cr_items ci + from sim_charactersx sc, cr_revisions cr, cr_items ci where sc.character_id = cr.revision_id and cr.item_id = ci.item_id and (sc.character_id = :character_id or ci.item_id = :character_id) + and ci.live_revision = sc.object_id } -column_array row }