Index: openacs-4/packages/dotlrn/www/subcommunity-archive.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/subcommunity-archive.tcl,v diff -u -r1.8.8.2 -r1.8.8.3 --- openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 20 Nov 2006 20:00:17 -0000 1.8.8.2 +++ openacs-4/packages/dotlrn/www/subcommunity-archive.tcl 22 Nov 2006 10:03:14 -0000 1.8.8.3 @@ -39,8 +39,7 @@ form create archive_form # this is lame, but I don't have a better way yet -set yes_label "[_ dotlrn.Yes_keep_members]" -set yes_delete_label "[_ dotlrn.Yes_delete_members]" +set yes_label "[_ dotlrn.Yes_Im_sure]" set no_label "[_ dotlrn.lt_No_I_dont_want_to_arc]" element create archive_form no_button \ @@ -49,16 +48,11 @@ -widget submit \ -value "1" -element create archive_form yes_keep_button \ +element create archive_form yes_button \ -label $yes_label \ -datatype text \ -widget submit -element create archive_form yes_delete_button \ - -label $yes_delete_label \ - -datatype text \ - -widget submit - element create archive_form community_id \ -label " " \ -datatype text \ @@ -72,30 +66,18 @@ -value $referer if {[form is_valid archive_form]} { - form get_values archive_form community_id referer no_button yes_keep_button yes_delete_button + form get_values archive_form community_id referer no_button yes_button - if {[string equal $yes_keep_button $yes_label]} { - #keep all memberships and archive this community - db_transaction { - set subcomm_id [dotlrn_community::archive \ - -community_id $community_id - ] - } - } + if {[string equal $yes_button $yes_label]} { - if {[string equal $yes_delete_button $yes_delete_label]} { - #delete all memberships ... - db_foreach get_list_of_members {} { - dotlrn_community::remove_user $community_id $user_id - } - #... and archive community db_transaction { set subcomm_id [dotlrn_community::archive \ - -community_id $community_id - ] + -community_id $community_id + ] } - } + ad_returnredirect "$referer" ad_script_abort -} +} +