Index: openacs-4/packages/static-portlet/www/element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/element.tcl,v
diff -u -N -r1.10.2.1.4.1 -r1.10.2.1.4.2
--- openacs-4/packages/static-portlet/www/element.tcl	22 Jun 2004 19:28:49 -0000	1.10.2.1.4.1
+++ openacs-4/packages/static-portlet/www/element.tcl	28 Jul 2004 00:35:06 -0000	1.10.2.1.4.2
@@ -40,13 +40,21 @@
 set community_id $package_id
 set portal_name [portal::get_name $portal_id]
 
+if [info exist content_id] {
+    set element_content_id $content_id
+    set file_content_id $content_id
+}
+
 ad_form -name static_element -form {
-    content_id:key
+    element_content_id:key
     {pretty_name:text(text)     {label "[_ static-portlet.Name]"} {html {size 60}}}
     {content:text(textarea)     {label "[_ static-portlet.Content]"} {html {rows 15 cols 80 wrap soft}}}
     {portal_id:text(hidden)     {value $portal_id}}
     {package_id:text(hidden)    {value $package_id}}
     {referer:text(hidden)       {value $referer}}
+} -edit_request {
+  db_1row get_content_element ""
+  ad_set_form_values pretty_name
 } -new_data {
     db_transaction {
         set item_id [static_portal_content::new \
@@ -64,14 +72,11 @@
     # redirect and abort
     ad_returnredirect $referer
     ad_script_abort
-} -edit_request {
-  db_1row get_content_element ""
-  ad_set_form_values pretty_name
 } -edit_data {
     db_transaction {
         static_portal_content::update \
                 -portal_id $portal_id \
-                -content_id $content_id \
+                -content_id $element_content_id \
                 -pretty_name $pretty_name \
                 -content $content
     }
@@ -83,12 +88,15 @@
 
 
 ad_form -name static_file -html {enctype multipart/form-data} -form {
-    content_id:key
+    file_content_id:key
     {pretty_name:text(text)     {label "[_ static-portlet.Name]"} {html {size 60}}}
     {upload_file:file           {label "[_ static-portlet.File]"}}
     {portal_id:text(hidden)     {value $portal_id}}
     {package_id:text(hidden)    {value $package_id}}
     {referer:text(hidden)       {value $referer}}
+} -edit_request {
+  db_1row get_content_element ""
+  ad_set_form_values pretty_name
 } -new_data {
     set filename [template::util::file::get_property filename $upload_file]
     set tmp_filename [template::util::file::get_property tmp_filename $upload_file]
@@ -118,9 +126,6 @@
     # redirect and abort
     ad_returnredirect $referer
     ad_script_abort
-} -edit_request {
-  db_1row get_content_element ""
-  ad_set_form_values pretty_name
 } -edit_data {
     set filename [template::util::file::get_property filename $upload_file]
     set tmp_filename [template::util::file::get_property tmp_filename $upload_file]
@@ -137,7 +142,7 @@
     db_transaction {
         static_portal_content::update \
                 -portal_id $portal_id \
-                -content_id $content_id \
+                -content_id $file_content_id \
                 -pretty_name $pretty_name \
                 -content $content
     }