Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v diff -u -N -r1.39.2.11 -r1.39.2.12 --- openacs-4/packages/acs-templating/tcl/list-procs.tcl 21 Mar 2007 12:17:00 -0000 1.39.2.11 +++ openacs-4/packages/acs-templating/tcl/list-procs.tcl 15 Jun 2007 01:50:23 -0000 1.39.2.12 @@ -2790,7 +2790,7 @@ # Provide a reference to the list properties for use by the list template # Get an upvar'd reference to list_properties get_reference -name $name - + set filter_names_options_tmp [list] set filter_names_options [list] set filter_hidden_filters [list] @@ -2799,9 +2799,8 @@ # loop through all the filters in this list foreach filter_ref $list_properties(filter_refs) { - upvar #$level $filter_ref filter_properties - if {$filter_properties(label) ne "" && $filter_properties(name) ne "orderby" && $filter_properties(name) ne "groupby"} { + if {$filter_properties(label) ne "" && [lsearch {orderby groupby page} $filter_properties(name)] < 0} { # filters with a label will be added to the form for the user # to choose from lappend filter_names_options_tmp [list $filter_properties(label) $filter_properties(name)] @@ -2832,7 +2831,6 @@ set list_filter_form_client_property_key [ns_sha1 [list [ad_conn url] $name $filter_key_filters]] upvar \#[template::adp_level] __client_property_filters client_property_filters set client_property_filters [ad_get_client_property acs-templating $list_filter_form_client_property_key] - # take out filters we already applied... set i 0 foreach option_list $filter_names_options_tmp { @@ -2881,7 +2879,6 @@ # form of selected filters set client_property_filters $__client_property_filters ad_set_client_property acs-templating $__list_filter_form_client_property_key $__client_property_filters - # now reload the form. excluding var clear_one set pattern [ns_urlencode "clear_one"]=[ns_urlencode "$clear_one"] regsub "${pattern}&?" [ad_return_url] {} url @@ -2987,6 +2984,5 @@ {submit:text(submit) {label "Apply Filters"}} } } - }