Index: openacs-4/packages/curriculum/lib/admin-curriculums-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/admin-curriculums-postgresql.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/curriculum/lib/admin-curriculums-postgresql.xql 22 Feb 2004 22:01:54 -0000 1.4 +++ openacs-4/packages/curriculum/lib/admin-curriculums-postgresql.xql 5 Jul 2004 14:07:20 -0000 1.5 @@ -16,38 +16,17 @@ substring(ce.description from 1 for :truncation_length) as element_desc, case when length(ce.description) > :truncation_length then 1 else 0 end as elem_desc_trunc_p, - ce.url as element_url, ce.enabled_p as element_enabled_p, ce.sort_key as element_sort_order, - author.first_names as author_first_names, - author.last_name as author_last_name, - author.email as author_email, - st.pretty_name as pretty_state, - st.short_name as state_short_name, - st.state_id, - st.hide_fields, - assignee.party_id as assignee_party_id, - assignee.email as assignee_email, - assignee.name as assignee_name + st.pretty_name as pretty_state from cu_curriculums cc left outer join cu_elements ce using (curriculum_id), - cc_users author, - workflow_cases cas left outer join - (select rpm.case_id, - p.party_id, - p.email, - acs_object__name(p.party_id) as name - from workflow_case_role_party_map rpm, - parties p - where rpm.role_id = :action_role - and p.party_id = rpm.party_id - ) assignee using (case_id), + workflow_cases cas, workflow_case_fsm cfsm, workflow_fsm_states st where cc.package_id = :package_id and cfsm.case_id = cas.case_id and st.state_id = cfsm.current_state - and cas.workflow_id = :workflow_id and cas.object_id = cc.curriculum_id $where_clauses order by cc.sort_key,