Index: openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/simulation/lib/Attic/sim-template-roles.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl 12 Nov 2003 14:51:16 -0000 1.3 +++ openacs-4/contrib/packages/simulation/lib/sim-template-roles.tcl 13 Nov 2003 13:32:39 -0000 1.4 @@ -44,10 +44,6 @@ name { label "Name" } - char_name { - label "Character" - link_url_col char_url - } delete { sub_class narrow link_url_col delete_url @@ -63,19 +59,13 @@ db_multirow -extend { edit_url char_url delete_url } roles select_roles " select wr.role_id, wr.pretty_name as name, - wr.sort_order, - cr.title as char_name + wr.sort_order from workflow_roles wr, - sim_roles sr, - cr_items ci, - cr_revisions cr + sim_roles sr where wr.workflow_id = :workflow_id and sr.role_id = wr.role_id - and ci.item_id = sr.character_id - and cr.revision_id = ci.live_revision [template::list::orderby_clause -orderby -name "roles"] " { set edit_url [export_vars -base "role-edit" { role_id }] - set char_url [export_vars -base "object/$char_name"] set delete_url [export_vars -base "role-delete" { role_id return_url }] } 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 -N -r1.3 -r1.4 --- openacs-4/packages/simulation/lib/sim-template-roles.tcl 12 Nov 2003 14:51:16 -0000 1.3 +++ openacs-4/packages/simulation/lib/sim-template-roles.tcl 13 Nov 2003 13:32:39 -0000 1.4 @@ -44,10 +44,6 @@ name { label "Name" } - char_name { - label "Character" - link_url_col char_url - } delete { sub_class narrow link_url_col delete_url @@ -63,19 +59,13 @@ db_multirow -extend { edit_url char_url delete_url } roles select_roles " select wr.role_id, wr.pretty_name as name, - wr.sort_order, - cr.title as char_name + wr.sort_order from workflow_roles wr, - sim_roles sr, - cr_items ci, - cr_revisions cr + sim_roles sr where wr.workflow_id = :workflow_id and sr.role_id = wr.role_id - and ci.item_id = sr.character_id - and cr.revision_id = ci.live_revision [template::list::orderby_clause -orderby -name "roles"] " { set edit_url [export_vars -base "role-edit" { role_id }] - set char_url [export_vars -base "object/$char_name"] set delete_url [export_vars -base "role-delete" { role_id return_url }] }