Index: openacs-4/packages/static-portlet/www/element-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/element-delete.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/static-portlet/www/element-delete.tcl 18 Feb 2002 05:23:12 -0000 1.1 +++ openacs-4/packages/static-portlet/www/element-delete.tcl 18 Feb 2002 20:56:22 -0000 1.2 @@ -6,14 +6,30 @@ } -query { {content_id ""} {referer "../one-community-admin"} + portal_id:integer,notnull } -properties { title:onevalue } +set ds_name [static_portlet::my_name] +set pretty_name [static_portal_content::get_pretty_name -content_id $content_id] -# do the deed -static_portal_content::delete -content_id $content_id +# THIS NEEDS TO BE GENERALIZED (FIXME - ben) +# FIXME : this might not be unique +set element_id [db_string select_element_id " +select element_id from portal_element_map, portal_pages +where portal_pages.portal_id= :portal_id +and portal_pages.page_id = portal_element_map.page_id +and ds_name= :ds_name and pretty_name= :pretty_name"] +db_transaction { + # Remove element + portal::remove_element $element_id + + # do the deed + static_portal_content::delete -content_id $content_id +} + # redirect and abort ad_returnredirect $referer ad_script_abort