Index: openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.tcl 24 Aug 2005 21:24:42 -0000 1.2 +++ openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.tcl 21 Oct 2005 18:33:12 -0000 1.3 @@ -35,6 +35,9 @@ set customer_id [lindex $owner_ids 0] set where_etat_ids [join [lrange $owner_ids 1 [llength $owner_ids]] "','" ] +if {[empty_string_p $where_etat_ids] } { + set where_etat_ids 0 +} set actions "" ns_log notice "WHERE $where_etat_ids , owner $customer_id " @@ -112,7 +115,7 @@ -pass_properties {customer_id owner_ids edit_link } \ -elements { name { - label {[_ glossar.Organization_Name]} + label {[_ glossar.Organization_name]} display_template "@gl_glossar_portlet.name@" } title { @@ -132,7 +135,7 @@ display_template "[_ acs-kernel.common_Edit]" } glossar_files { - display_template "[_ glossar.Files]" + display_template "[_ glossar.Files] (@gl_glossar_portlet.files_count@)" } } -actions $actions -sub_class narrow \ @@ -157,14 +160,15 @@ set static_customer_id $customer_id -db_multirow -extend {source_category target_category gl_translation_p glossar_edit glossar_files files_url edit_url title_url new_glossar} gl_glossar_portlet gl_glossar_portlet {} { +db_multirow -extend {source_category target_category gl_translation_p glossar_edit glossar_files files_url edit_url title_url new_glossar files_count } gl_glossar_portlet gl_glossar_portlet {} { if {![empty_string_p $target_category_id]} { set gl_translation_p 1 } else { set gl_translation_p 0 } set glossar_edit "[_ glossar.glossar_Edit]" set glossar_files "[_ glossar.files]" + set files_count [db_string get_files_count { } -default 0] set source_category "[category::get_name $source_category_id]" set target_category "[category::get_name $target_category_id]" set title_url "[export_vars -base "${base_url}/glossar-term-list" {glossar_id gl_translation_p customer_id owner_id}]" Index: openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.xql 23 Aug 2005 19:39:16 -0000 1.1 +++ openacs-4/packages/glossar-portlet/lib/glossar-portlet-list.xql 21 Oct 2005 18:33:12 -0000 1.2 @@ -1,31 +1,68 @@ - - - - - - - - - - SELECT cr.item_id as glossar_id , crr.title , crr.description , gl.source_category_id , gl.target_category_id , gl.owner_id, org.name , 1 as query_number , -case when gl.target_category_id is null then 0 else 1 end as sort_key - FROM gl_glossars gl, cr_items cr, cr_revisions crr , organizations org - WHERE cr.latest_revision = crr.revision_id - AND crr.revision_id = gl.glossar_id - AND gl.owner_id = org.organization_id - AND org.organization_id = :customer_id - UNION - SELECT cr.item_id as glossar_id , crr.title , crr.description , gl.source_category_id , gl.target_category_id , gl.owner_id, org.name , 2 as query_number , -case when gl.target_category_id is null then 0 else 1 end as sort_key - FROM gl_glossars gl, cr_items cr, cr_revisions crr, organizations org - WHERE cr.latest_revision = crr.revision_id - AND crr.revision_id = gl.glossar_id - AND gl.owner_id = org.organization_id - AND org.organization_id IN ('$where_etat_ids') - ORDER BY query_number asc , + + + SELECT + cr.item_id as glossar_id, + crr.title, + crr.description, + gl.source_category_id, + gl.target_category_id, + gl.owner_id, + org.name, + 1 as query_number, + case + when gl.target_category_id is null + then 0 + else 1 end as sort_key + FROM + gl_glossars gl, + cr_items cr, + cr_revisions crr, + organizations org + WHERE + cr.latest_revision = crr.revision_id + AND crr.revision_id = gl.glossar_id + AND gl.owner_id = org.organization_id + AND org.organization_id = :customer_id + UNION + SELECT + cr.item_id as glossar_id, + crr.title, + crr.description, + gl.source_category_id, + gl.target_category_id, + gl.owner_id, + org.name, + 2 as query_number, + case + when gl.target_category_id is null + then 0 + else 1 end as sort_key + FROM + gl_glossars gl, + cr_items cr, + cr_revisions crr, + organizations org + WHERE + cr.latest_revision = crr.revision_id + AND crr.revision_id = gl.glossar_id + AND gl.owner_id = org.organization_id + AND org.organization_id IN ('$where_etat_ids') + ORDER BY query_number asc + + + + select + count(ci.item_id) + from + cr_items ci + where + ci.parent_id = :glossar_id + + + \ No newline at end of file