Index: openacs-4/packages/download/www/admin/report-version-downloads.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/download/www/admin/report-version-downloads.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/download/www/admin/report-version-downloads.tcl 16 Jan 2003 13:46:20 -0000 1.6
+++ openacs-4/packages/download/www/admin/report-version-downloads.tcl 12 Sep 2013 10:26:12 -0000 1.7
@@ -6,7 +6,7 @@
@cvs-id $Id$
} {
{archive_id:integer,notnull}
- {orderby "last_name"}
+ {orderby "user_name"}
{downloaded 1m}
{versions "current"}
} -properties {
@@ -21,7 +21,7 @@
set repository_id [download_repository_id]
-ad_require_permission $archive_id "admin"
+permission::require_permission -object_id $archive_id -privilege "admin"
set dimensional {
{versions "Versions" current {
@@ -37,35 +37,52 @@
}}
}
-set table_def {
- {user_name "User Name"
- {user_name $order}
- {
$user_name | }}
- {version_name "Version"
- {version_name $order}
- {$version_name | }}
- {download_date "Download Date"
- {download_date $order}
- {}}
- {download_ip "From IP (hostname)"
- {download_ip $order}
- {$download_ip ($download_hostname) | }}
- {reason "Download Reason"
- {reason $order}
- {$reason | }}
-}
+template::list::create -name download_list \
+ -multirow downloads \
+ -html {width "90%" align center} \
+ -elements {
+ user_name {
+ label "User Name"
+ orderby user_name
+ link_url_col url_one_user
+ }
+ version_name {
+ label "Version"
+ orderby version_name
+ link_url_col url_one_revision
+
+ }
+ download_date {
+ label "Download Date"
+ orderby download_date
+ }
+ download_ip {
+ label "From IP (hostname)"
+ orderby download_ip
+ display_template {
+ @downloads.download_ip@ (@downloads.download_hostname@)
+ }
+ }
+ reason {
+ label "Download Reason"
+ orderby reason
+ }
+ } -filters {archive_id {} downloaded {} versions {}}
db_1row name_select { *SQL* }
set current_count [db_string current_count { *SQL* }]
set total_count [db_string total_count { *SQL* }]
set dimensional_html [ad_dimensional $dimensional]
-set table [ad_table \
- -Ttable_extra_html { width="90%" align="center" } \
- -bind [ad_tcl_vars_to_ns_set archive_id] \
- download_table { *SQL* } $table_def ]
+set pkg_url [ad_conn package_url]
+db_multirow -extend {url_one_ip url_one_revision url_one_user} downloads download_table { *SQL* } {
+ set url_one_user [export_vars -base report-one-user {user_id}]
+ set url_one_revision [export_vars -base "${pkg_url}one-revision" {revision_id downloaded}]
+ set url_one_ip [export_vars -base report-one-ip {download_ip downloaded}]
+}
+
# query users to spam
set user_id_list [db_list users_to_spam { *SQL* }]
set user_id_list_export [export_vars -form -sign user_id_list]