Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql,v diff -u -r1.10 -r1.11 --- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql 10 Mar 2006 19:28:53 -0000 1.10 +++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-oracle.xql 12 May 2006 19:20:48 -0000 1.11 @@ -36,6 +36,7 @@ dc.course_id = ci.live_revision and [template::list::filter_where_clauses -and -name course_list] + $show_hidden_not_exists_clause order by lower (dc.course_name), lower(dec.section_name) Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql 10 Mar 2006 19:28:53 -0000 1.12 +++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk-postgresql.xql 12 May 2006 19:20:48 -0000 1.13 @@ -33,6 +33,7 @@ where dc.course_id = ci.live_revision [template::list::filter_where_clauses -and -name course_list] + $show_hidden_not_exists_clause order by lower(dc.course_name), lower(dec.section_name) Index: openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl,v diff -u -r1.79 -r1.80 --- openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl 27 Apr 2006 21:49:15 -0000 1.79 +++ openacs-4/packages/dotlrn-ecommerce/lib/tree-chunk.tcl 12 May 2006 19:20:48 -0000 1.80 @@ -12,7 +12,7 @@ instructor:optional { orderby course_name } { groupby course_name } - {show_hidden "f"} + show_hidden:optional {active_calendar_id 0} {all_sessions_p 0} @@ -251,8 +251,14 @@ set show_hidden f set hidden_filter_hide_p 1 } -lappend filters show_hidden [list hide_p $hidden_filter_hide_p label [_ dotlrn-ecommerce.Hidden_Courses] values { {[_ dotlrn-ecommerce.Show] t} {[_ dotlrn-ecommerce.Hide] f}} where_clause " (display_section_p <> :show_hidden or display_section_p is null or display_section_p = 't') "] +lappend filters show_hidden [list hide_p $hidden_filter_hide_p label [_ dotlrn-ecommerce.Hidden_Courses] values { {[_ dotlrn-ecommerce.Show] t} } where_clause ""] +if { ![exists_and_not_null show_hidden] } { + set show_hidden_not_exists_clause "and (display_section_p is null or display_section_p = 't')" +} else { + set show_hidden_not_exists_clause "" +} + set actions [list] lappend actions "[_ dotlrn-ecommerce.View_All]" ? "[_ dotlrn-ecommerce.View_All]" @@ -303,6 +309,7 @@ spacing { label "" display_template { + } html { width 10% bgcolor=white } }