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 -r1.12 -r1.13 --- openacs-4/packages/acs-templating/tcl/list-procs.tcl 10 Nov 2003 10:20:47 -0000 1.12 +++ openacs-4/packages/acs-templating/tcl/list-procs.tcl 11 Dec 2003 21:39:57 -0000 1.13 @@ -65,6 +65,7 @@ -actions [list "Add item" [export_vars -base item-add {order_id}] "Add item to this order"] \ -bulk_actions { "Remove" "item-remove" "Remove checked items" + "Copy" "item-copy" "Copy checked items to clipboard" } \ -bulk_action_export_vars { order_id @@ -449,8 +450,18 @@ # Split the current ordering info into name and direction # name is the string before the comma, order (asc/desc) is what's after if { [info exists list_properties(filter,$list_properties(orderby_name))] } { - foreach { orderby_name orderby_direction } [lrange [split $list_properties(filter,$list_properties(orderby_name)) ","] 0 1] {} + foreach { orderby_name orderby_direction } \ + [lrange [split $list_properties(filter,$list_properties(orderby_name)) ","] 0 1] {} + set list_properties(orderby_selected_name) $orderby_name + + if { [empty_string_p $orderby_direction] } { + template::list::orderby::get_reference \ + -list_name $name \ + -orderby_name $orderby_name + + set orderby_direction $orderby_properties(default_direction) + } set list_properties(orderby_selected_direction) $orderby_direction } @@ -2222,6 +2233,15 @@ orderby_desc: The reverse ordering from 'orderby_asc'.
  • + orderby_name: The name of a named query, same functionality as orderby property. +
  • +
  • + orderby_asc_name: The name of a named query, same functionality as orderby_asc property. +
  • +
  • + orderby_desc_name: The name of a named query, same functionality as orderby_desc property. +
  • +
  • default_direction: The default order direction, 'asc' or 'desc'. Defaults to 'asc'.
  • @@ -2361,6 +2381,22 @@ set orderby_properties(orderby_asc) "$value asc" set orderby_properties(orderby_desc) "$value desc" } + orderby_asc_name { + set orderby_properties($property) $value + set value [uplevel $ulevel [list db_map $value]] + set orderby_properties(orderby_asc) $value + } + orderby_desc_name { + set orderby_properties($property) $value + set value [uplevel $ulevel [list db_map $value]] + set orderby_properties(orderby_desc) $value + } + orderby_name { + set orderby_properties($property) $value + set value [uplevel $ulevel [list db_map $value]] + set orderby_properties(orderby_asc) "$value asc" + set orderby_properties(orderby_desc) "$value desc" + } default { # We require all properties to be initialized to the empty string in the array, otherwise they're illegal. if { ![info exists orderby_properties($property)] } {