Index: openacs-4/packages/dotlrn/www/admin/term.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.tcl,v diff -u -r1.12.6.3 -r1.12.6.4 --- openacs-4/packages/dotlrn/www/admin/term.tcl 29 Oct 2004 02:50:47 -0000 1.12.6.3 +++ openacs-4/packages/dotlrn/www/admin/term.tcl 22 Nov 2004 22:23:08 -0000 1.12.6.4 @@ -25,6 +25,7 @@ {department_key ""} {orderby "department_name,asc"} page:optional + {keyword ""} } -properties { classes:multirow } @@ -104,11 +105,17 @@ set query "select_all_classes" set paginator_query "select_all_classes_paginator" } + if {![empty_string_p $department_key]} { append query "_by_department" append paginator_query "_by_department" } +if { ![empty_string_p $keyword] } { + set keyword_clause [db_map select_all_instances_keyword] +} else { + set keyword_clause [db_map select_all_instances_without_keyword] +} if {$term_id == -1} { set title "[_ dotlrn.All_Terms]" set context_bar [list [list terms [_ dotlrn.Terms]] "[_ dotlrn.All_Terms]"] @@ -167,7 +174,7 @@ template::list::create \ -name classes \ -multirow classes \ - -filters { department_key {} term_id {} } \ + -filters { department_key {} term_id {} keyword {} } \ -key class_key \ -page_size 50 \ -page_flush_p t \