Index: openacs-4/packages/xotcl-core/tcl/generic-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/generic-procs.tcl,v diff -u -N -r1.94.6.9 -r1.94.6.10 --- openacs-4/packages/xotcl-core/tcl/generic-procs.tcl 6 Oct 2014 21:19:36 -0000 1.94.6.9 +++ openacs-4/packages/xotcl-core/tcl/generic-procs.tcl 14 Oct 2014 12:59:11 -0000 1.94.6.10 @@ -419,18 +419,18 @@ List instproc elements {} { my instvar no_edit_p no_delete_p + set elements {} if {!$no_edit_p} { set type [my set pretty_name] set title [_ xotcl-core.edit_type] - set elements [list \ + lappend elements \ edit [list \ link_url_col edit_url \ display_template [list ] \ link_html [list title $title] \ - sub_class narrow]] + sub_class narrow] } - set elements [concat \ - $elements [my set elements]] + set elements [concat $elements [my set elements]] if {!$no_delete_p} { set title [_ xotcl-core.delete_item] set confirm "[_ acs-subsite.Delete]?" @@ -445,13 +445,17 @@ } List instproc page_query {} { - my instvar class id_column list_name - return [$class instance_select_query \ - -select_attributes [list $id_column] \ - -where_clause \ - "\[template::list::filter_where_clauses -name $list_name -and\]" \ - -orderby \ - "\[lrange \[template::list::orderby_clause -name $list_name -orderby\] 2 end\]"] + my instvar class id_column list_name orderby + if {$orderby ne ""} { + return [$class instance_select_query \ + -select_attributes [list $id_column] \ + -where_clause "\[template::list::filter_where_clauses -name $list_name -and\]" \ + -orderby "\[lrange \[template::list::orderby_clause -name $list_name -orderby\] 2 end\]"] + } else { + return [$class instance_select_query \ + -select_attributes [list $id_column] \ + -where_clause "\[template::list::filter_where_clauses -name $list_name -and\]"] + } } List instproc filters {} {