Index: openacs-4/packages/acs-object-management/lib/forms/generic.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-object-management/lib/forms/generic.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-object-management/lib/forms/generic.tcl	6 Mar 2011 18:43:20 -0000	1.2
+++ openacs-4/packages/acs-object-management/lib/forms/generic.tcl	9 May 2011 02:03:46 -0000	1.3
@@ -11,9 +11,14 @@
 "
 
 ad_form -name $object_view -export {return_url} \
-  -form [form::form_part -object_view $object_view] \
+  -form [object::form::form_part -object_view $object_view] \
   -select_query_name select_values \
   -on_request {
+    if { [content::type::is_content_type -object_type \
+             [object_view::get_element -object_view $object_view -element object_type] } {
+        ad_return_complaint 1 [_ object_view_content_type]
+        ad_script_abort
+    }
     if { [info exists ${object_view}_id] } {
         permission::require_permission \
             -party_id [ad_conn user_id] \
@@ -26,9 +31,9 @@
             -privilege create
     }
 } -new_data {
-    object::new_from_form -object_view $object_view 
+    object::form::new -object_view $object_view 
 } -edit_data {
-    object::update_from_form -object_view $object_view
+    object::form::update -object_view $object_view
 } -after_submit {
     if { [info exists return_url] } {
         ad_returnredirect $return_url