Index: openacs-4/packages/xotcl-core/tcl/generic-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/generic-procs.tcl,v
diff -u -N -r1.95 -r1.96
--- openacs-4/packages/xotcl-core/tcl/generic-procs.tcl	27 Oct 2014 16:42:01 -0000	1.95
+++ openacs-4/packages/xotcl-core/tcl/generic-procs.tcl	27 Apr 2015 15:28:21 -0000	1.96
@@ -92,11 +92,18 @@
     }
     return $vars
   }
+  Form instproc get_id_field {} {
+    my instvar data
+    if {[$data istype ::xo::db::CrItem]} {
+      return item_id
+    }
+    return object_id
+  }
   Form instproc new_data {} {
     my instvar data
     #my log "--- new_data ---"
     $data save_new
-    return [$data set object_id]
+    return [$data set [my get_id_field]]
   }
   Form instproc edit_data {} {
     #my log "--- edit_data --- setting form vars=[my form_vars]"
@@ -111,7 +118,7 @@
 	$data rename -old_name $old_name -new_name $new_name
       }
     }
-    return [$data set object_id]
+    return [$data set [my get_id_field]]
   }
 
   Form instproc request {privilege} {
@@ -178,7 +185,7 @@
     }
     #ns_log notice "-- redirect to $link // [string match "*\?*" $link]"
     ad_returnredirect $link
-    ad_script_abort
+    #ad_script_abort
   }
   
   Form ad_instproc generate {