Index: openacs-4/packages/logger/lib/entries.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/lib/entries.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/logger/lib/entries.xql 14 Jan 2004 08:58:12 -0000 1.3 +++ openacs-4/packages/logger/lib/entries.xql 27 Feb 2004 17:43:50 -0000 1.4 @@ -26,14 +26,15 @@ from logger_projects lp, logger_project_pkg_map lppm where lp.project_id = lppm.project_id - and lppm.package_id = :package_id + and lppm.package_id = :package_id + and lp.active_p = 't' order by lp.name - select lv.name || ' (' || lv.unit || ')' as name, + select distinct lv.name || ' (' || lv.unit || ')' as name, lv.variable_id from logger_variables lv, logger_project_var_map lpvm, Index: openacs-4/packages/logger/tcl/project-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/logger/tcl/project-procs-oracle.xql 26 Feb 2004 15:29:18 -0000 1.5 +++ openacs-4/packages/logger/tcl/project-procs-oracle.xql 27 Feb 2004 17:43:51 -0000 1.6 @@ -27,16 +27,6 @@ - - - select distinct acs_object.name(p.project_lead), project_lead - from logger_projects p, - logger_project_pkg_map ppm - where ppm.project_id = p.project_id - and ppm.package_id = :package_id - - - select min(p.projection_id) Index: openacs-4/packages/logger/tcl/project-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs-postgresql.xql,v diff -u -r1.6 -r1.7 --- openacs-4/packages/logger/tcl/project-procs-postgresql.xql 26 Feb 2004 15:29:18 -0000 1.6 +++ openacs-4/packages/logger/tcl/project-procs-postgresql.xql 27 Feb 2004 17:43:51 -0000 1.7 @@ -23,16 +23,6 @@ - - - select distinct acs_object__name(p.project_lead), project_lead - from logger_projects p, - logger_project_pkg_map ppm - where ppm.project_id = p.project_id - and ppm.package_id = :package_id - - - select min(p.projection_id) Index: openacs-4/packages/logger/tcl/project-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/logger/tcl/project-procs.tcl 5 Jan 2004 21:05:27 -0000 1.8 +++ openacs-4/packages/logger/tcl/project-procs.tcl 27 Feb 2004 17:43:51 -0000 1.9 @@ -282,6 +282,7 @@ Get the list of users to display in a drop-down to pick project lead. } { set package_id [ad_conn package_id] + set user_id [ad_conn user_id] set users_list [db_list_of_lists select_project_leads {}] Index: openacs-4/packages/logger/tcl/project-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/project-procs.xql,v diff -u -r1.7 -r1.8 --- openacs-4/packages/logger/tcl/project-procs.xql 11 Dec 2003 21:40:07 -0000 1.7 +++ openacs-4/packages/logger/tcl/project-procs.xql 27 Feb 2004 17:43:51 -0000 1.8 @@ -91,5 +91,20 @@ + + + select uouter.first_names || ' ' || uouter.last_name, uouter.user_id + from cc_users uouter + where uouter.user_id in (select distinct u.user_id + from cc_users u + where u.user_id in (select p.project_lead + from logger_projects p, + logger_project_pkg_map ppm + where ppm.project_id = p.project_id + and ppm.package_id = :package_id) + or u.user_id = :user_id) + order by lower(uouter.first_names), lower(uouter.last_name) + + Index: openacs-4/packages/logger/tcl/ui-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/tcl/ui-procs.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/logger/tcl/ui-procs.xql 28 Aug 2003 09:45:30 -0000 1.3 +++ openacs-4/packages/logger/tcl/ui-procs.xql 27 Feb 2004 17:43:51 -0000 1.4 @@ -21,6 +21,7 @@ logger_project_pkg_map lppm where lp.project_id = lppm.project_id and lppm.package_id = :package_id + and lp.active_p = 't' order by name Index: openacs-4/packages/logger/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/index.tcl,v diff -u -r1.21 -r1.22 --- openacs-4/packages/logger/www/index.tcl 27 Feb 2004 16:58:13 -0000 1.21 +++ openacs-4/packages/logger/www/index.tcl 27 Feb 2004 17:43:52 -0000 1.22 @@ -49,6 +49,9 @@ if { $num_package_projects == 1 } { set project_id $package_projects } +} else { + # Assume at least one project, if one is selected + set num_package_projects 1 } # Default to the current projection Index: openacs-4/packages/logger/www/log.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/log.adp,v diff -u -r1.12 -r1.13 --- openacs-4/packages/logger/www/log.adp 11 Jan 2004 17:52:40 -0000 1.12 +++ openacs-4/packages/logger/www/log.adp 27 Feb 2004 17:43:52 -0000 1.13 @@ -1,7 +1,7 @@ @page_title;noquote@ @context;noquote@ -log_entry_form.category_id +@focus;noquote@