Index: openacs-4/packages/logger/lib/entries.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/logger/lib/entries.xql 27 Feb 2004 17:43:50 -0000 1.4 +++ openacs-4/packages/logger/lib/entries.xql 3 Jun 2004 21:08:23 -0000 1.5 @@ -27,7 +27,8 @@ logger_project_pkg_map lppm where lp.project_id = lppm.project_id and lppm.package_id = :package_id - and lp.active_p = 't' + and lp.active_p = 't' + $project_where order by lp.name @@ -48,17 +49,17 @@ select submitter.first_names || ' ' || submitter.last_name as label, - submitter.user_id as user_id - from cc_users submitter, + submitter.person_id as user_id + from persons submitter, logger_entries le, acs_objects ao where ao.object_id = le.entry_id - and submitter.user_id = ao.creation_user + and submitter.person_id = ao.creation_user and exists (select 1 from logger_project_pkg_map where project_id = le.project_id and package_id = :package_id) - group by submitter.user_id, submitter.first_names, submitter.last_name + group by submitter.person_id, submitter.first_names, submitter.last_name