Index: openacs-4/packages/bboard-portlet/www/bboard-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bboard-portlet/www/bboard-portlet.adp,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/bboard-portlet/www/bboard-portlet.adp 12 Mar 2002 01:54:27 -0000 1.7 +++ openacs-4/packages/bboard-portlet/www/bboard-portlet.adp 13 Mar 2002 22:00:25 -0000 1.8 @@ -1,37 +1,23 @@ + + -<% -set ul_output_p 0 - -foreach forum $forums { - set forum_name [lindex $forum 0] - set forum_url [lindex $forum 1] - set forum_forums [lindex $forum 2] + +
    + + + @data@ + + +
+ - # Skip forum groups with no forums - if {[llength $forum_forums] == 0} { - continue - } + + + No Forums + - foreach one_forum $forum_forums { - if {!$ul_output_p} { - template::adp_puts "" -} else { - template::adp_puts "No Discussion Forums" -} -%> + + +   + Index: openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl 12 Mar 2002 01:54:27 -0000 1.2 +++ openacs-4/packages/bboard-portlet/www/bboard-portlet.tcl 13 Mar 2002 22:00:25 -0000 1.3 @@ -1,63 +1,46 @@ - array set config $cf -set query " -select message_id, -forum_id, -title, -num_replies, -first_names||' '||last_name as full_name, -to_char(last_reply_date,'MM/DD/YY hh12:Mi am') as last_updated -from bboard_messages_all b, persons, acs_objects ao -where b.forum_id = ao.object_id -and forum_id in (select forum_id -from bboard_forums -where bboard_id = :instance_id) -and person_id = sender -and reply_to is null -order by sent_date desc" - -set shaded_query " -select forum_id, short_name -from bboard_forums -where bboard_id = :instance_id" - - -# Should be a list already! (ben) +set shaded_p $config(shaded_p) set list_of_instance_ids $config(instance_id) +set data "" -set forums [list] +if {[llength $list_of_instance_ids] == 1} { + set one_instance_p 1 +} else { + set one_instance_p 0 +} -# Added by Ben + foreach instance_id $list_of_instance_ids { - set url [dotlrn_community::get_url_from_package_id -package_id $instance_id] + set comm_url [dotlrn_community::get_url_from_package_id -package_id $instance_id] + set comm_name [site_nodes::get_parent_name \ + -instance_id $instance_id + ] - # aks fold into site_nodes:: or dotlrn_community - set comm_object_id [db_string select_name "select object_id from site_nodes where node_id= (select parent_id from site_nodes where object_id=:instance_id)" ] - - set name [db_string select_pretty_name " - select instance_name - from apm_packages - where package_id= :comm_object_id "] - - set one_forum_forums [list] - - db_foreach select_shaded $shaded_query { - lappend one_forum_forums [list $forum_id $short_name] + set f_check [db_0or1row one_forum_check {select 1 from bboard_forums where bboard_id = :instance_id} ] + + if {!$one_instance_p && $f_check} { + append data "
  • $comm_name" + append data "" + } } -if {[info exists config(display_group_name_p)]} { - ns_log Notice "bboard-portlet: display_group_name_p: $config(display_group_name_p)" - set display_group_name_p $config(display_group_name_p) +# portlets shouldn't disappear anymore (ben) +if {[empty_string_p $data]} { + set no_forums_p "t" } else { - ns_log Notice "bboard-portlet: no display_group_name_p param" - set display_group_name_p t + set no_forums_p "f" } - -# return the template -ad_return_template Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v diff -u -N -r1.15 -r1.16 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 11 Mar 2002 22:19:43 -0000 1.15 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 13 Mar 2002 21:57:43 -0000 1.16 @@ -1,10 +1,10 @@ [Join/Drop a Class or Community Group] -

    +