From 3b8750126d2caba0abd835ab5162f682bc07ebfa Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Wed, 30 Jul 2014 12:49:02 +0000
Subject: [PATCH] Propagate field's local parameters

---
 .../web_page_module/rjs_gadget_erp5_form_js.xml    |  5 ++---
 .../rjs_gadget_erp5_pt_form_list_js.xml            |  8 +++++++-
 .../rjs_gadget_erp5_pt_form_view_js.xml            | 14 ++++++++++++--
 bt5/erp5_web_renderjs_ui/bt/revision               |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_form_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_form_js.xml
index 0b402dacfd..1d9aa490e4 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_form_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_form_js.xml
@@ -145,9 +145,8 @@
       delete options.erp5_document;\n
       delete options.form_definition;\n
 \n
-\n
-      options = options.form_gadget || {};\n
-      form_gadget.state_parameter_dict = options;\n
+//       options = options.form_gadget || {};\n
+      form_gadget.state_parameter_dict = options.form_gadget || {};\n
 \n
       form_gadget.props.gadget_list = [];\n
       form_gadget.props.id = erp5_document._id;\n
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
index fc0b703e6f..94a48aaad1 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
@@ -108,10 +108,16 @@
     // declared methods\n
     /////////////////////////////////////////////////////////////////\n
     .declareMethod(\'render\', function (options) {\n
+\n
+      var form_options = options.erp5_form || {};\n
+\n
+      form_options.erp5_document = options.erp5_document;\n
+      form_options.form_definition = options.form_definition;\n
+      form_options.view = options.view;\n
 \n
       return this.getDeclaredGadget("erp5_form")\n
         .push(function (erp5_form) {\n
-          return erp5_form.render(options);\n
+          return erp5_form.render(form_options);\n
         });\n
 \n
     });\n
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml
index 79c383568c..f894322e5a 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_js.xml
@@ -145,9 +145,19 @@
           ]);\n
         })\n
         .push(function (all_gadget) {\n
+          var form_options = options.erp5_form || {},\n
+            tab_options = options.erp5_tag || {};\n
+\n
+          form_options.erp5_document = options.erp5_document;\n
+          form_options.form_definition = options.form_definition;\n
+          form_options.view = options.view;\n
+          tab_options.erp5_document = options.erp5_document;\n
+          tab_options.form_definition = options.form_definition;\n
+          tab_options.view = options.view;\n
+\n
           return RSVP.all([\n
-            all_gadget[1].render(options),\n
-            all_gadget[0].render(options),\n
+            all_gadget[1].render(form_options),\n
+            all_gadget[0].render(tab_options),\n
           ]);\n
         });\n
 \n
diff --git a/bt5/erp5_web_renderjs_ui/bt/revision b/bt5/erp5_web_renderjs_ui/bt/revision
index da2d3988d7..3f10ffe7a4 100644
--- a/bt5/erp5_web_renderjs_ui/bt/revision
+++ b/bt5/erp5_web_renderjs_ui/bt/revision
@@ -1 +1 @@
-14
\ No newline at end of file
+15
\ No newline at end of file
-- 
2.30.9