--- a/src/pyams_form/templates/form.pt	Mon Jan 18 17:53:08 2016 +0100
+++ b/src/pyams_form/templates/form.pt	Wed May 11 12:31:12 2016 +0200
@@ -32,7 +32,7 @@
 							  accept view.accept;
 							  autocomplete view.autocomplete;
 							  class view.css_class;
-							  data-ams-data extension:view_data;
+							  data-ams-data extension:object_data(view);
 							  data-ams-form-handler view.get_ajax_handler() | nothing;
 							  data-ams-form-options view.get_form_options() | nothing;
 							  data-ams-form-submit-target view.form_target | nothing;

--- a/src/pyams_form/templates/inner-form.pt	Mon Jan 18 17:53:08 2016 +0100
+++ b/src/pyams_form/templates/inner-form.pt	Wed May 11 12:31:12 2016 +0200
@@ -15,7 +15,7 @@
 						  accept view.accept;
 						  autocomplete view.autocomplete;
 						  class view.css_class;
-						  data-ams-data extension:view_data;
+						  data-ams-data extension:object_data(view);
 						  data-ams-form-handler view.get_ajax_handler() | nothing;
 						  data-ams-form-options view.get_form_options() | nothing;
 						  data-ams-form-submit-target view.form_target | nothing;

--- a/src/pyams_form/templates/widget-form.pt	Mon Jan 18 17:53:08 2016 +0100
+++ b/src/pyams_form/templates/widget-form.pt	Wed May 11 12:31:12 2016 +0200
@@ -22,7 +22,7 @@
 							  accept view.accept;
 							  autocomplete view.autocomplete;
 							  class view.css_class;
-							  data-ams-data extension:view_data;
+							  data-ams-data extension:object_data(view);
 							  data-ams-form-handler view.get_ajax_handler() | nothing;
 							  data-ams-form-options view.get_form_options() | nothing;
 							  data-ams-form-submit-target view.form_target | nothing;

--- a/src/pyams_form/widget/templates/button-input.pt	Mon Jan 18 17:53:08 2016 +0100
+++ b/src/pyams_form/widget/templates/button-input.pt	Wed May 11 12:31:12 2016 +0200
@@ -31,5 +31,5 @@
 						accesskey view/accesskey;
 						onselect view/onselect;
 						data-loading-text string:${value}...;
-						data-ams-data extension:view_data;"
+						data-ams-data extension:object_data(view);"
 		tal:content="value"></button>

--- a/src/pyams_form/widget/templates/close-input.pt	Mon Jan 18 17:53:08 2016 +0100
+++ b/src/pyams_form/widget/templates/close-input.pt	Wed May 11 12:31:12 2016 +0200
@@ -30,6 +30,6 @@
 						alt view/alt;
 						accesskey view/accesskey;
 						onselect view/onselect;
-						data-ams-data extension:view_data;"
+						data-ams-data extension:object_data(view);"
 		data-dismiss="modal"
 		tal:content="value"></button>

--- a/src/pyams_form/widget/templates/radio-input.pt	Mon Jan 18 17:53:08 2016 +0100
+++ b/src/pyams_form/widget/templates/radio-input.pt	Wed May 11 12:31:12 2016 +0200
@@ -30,7 +30,7 @@
 								accesskey view/accesskey;
 								onselect view/onselect;
 								checked python: checked and 'checked' or None;
-								data-ams-data extension:view_data;" />
+								data-ams-data extension:object_data(view);" />
 		<i></i><span tal:replace="item/label" i18n:translate="">Label</span>
 	</label>
 </div>

--- a/src/pyams_form/widget/templates/reset-input.pt	Mon Jan 18 17:53:08 2016 +0100
+++ b/src/pyams_form/widget/templates/reset-input.pt	Wed May 11 12:31:12 2016 +0200
@@ -30,5 +30,5 @@
 						alt view/alt;
 						accesskey view/accesskey;
 						onselect view/onselect;
-						data-ams-data extension:view_data;"
+						data-ams-data extension:object_data(view);"
 		tal:content="value"></button>

--- a/src/pyams_form/widget/templates/submit-input.pt	Mon Jan 18 17:53:08 2016 +0100
+++ b/src/pyams_form/widget/templates/submit-input.pt	Wed May 11 12:31:12 2016 +0200
@@ -31,5 +31,5 @@
 						accesskey view/accesskey;
 						onselect view/onselect;
 						data-loading-text string:${value}...;
-						data-ams-data extension:view_data;"
+						data-ams-data extension:object_data(view);"
 		tal:content="value"></button>