Index: openacs-4/packages/logger/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/logger/www/admin/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/logger/www/admin/index.tcl	1 May 2003 07:20:58 -0000	1.2
+++ openacs-4/packages/logger/www/admin/index.tcl	1 May 2003 14:16:18 -0000	1.3
@@ -12,10 +12,34 @@
 
 set home_url [ad_parameter -package_id [ad_acs_kernel_id] HomeURL]
 
-db_multirow projects select_projects {} {
+set application_url [ad_conn url]
+set permissions_uri "/permissions/one"
+
+db_multirow -extend { permissions_url } projects select_projects {} {
     set description [string_truncate -len 50 $description]
+    set permissions_url "${permissions_uri}?[export_vars {{object_id $project_id} application_url}]"
 }
 
-logger::package::variables_multirow
+db_multirow -extend { permissions_url } variables select_variables {
+      select lv.variable_id,
+             lv.name,
+             lv.unit,
+             lv.type,
+             acs_permission.permission_p(lv.variable_id, :user_id, 'admin') as admin_p
+      from logger_variables lv
+      where (exists (select 1
+                    from logger_project_var_map lpvm,
+                         logger_project_pkg_map lppm
+                    where lv.variable_id = lpvm.variable_id
+                      and lpvm.project_id = lppm.project_id
+                      and lppm.package_id = :package_id
+                   )
+         or lv.package_id = :package_id
+         or lv.package_id is null)
+} {
+    set permissions_url "${permissions_uri}?[export_vars {{object_id $variable_id} application_url}]"
+}
 
+set package_permissions_url "${permissions_uri}?[export_vars {{object_id $package_id} application_url}]"
+
 ad_return_template