From 6c04613d8ea63b9ea1d290c1aea4cb7aa472d354 Mon Sep 17 00:00:00 2001
From: Xiaowu Zhang <xiaowu.zhang@tiolive.com>
Date: Thu, 27 Nov 2014 12:21:06 +0000
Subject: [PATCH] Use FileValidator to post element's value  with key

---
 .../gadget_field_zuite/testBlobSave.xml          |  4 ++--
 .../testNotDataURLException.xml                  |  4 ++--
 .../gadget_field_zuite/testNotEditable.xml       |  8 ++++----
 .../gadget_field_zuite/testSaveAndLoad.xml       |  8 ++++----
 .../testSaveAndNotEditableInIFrame.xml           | 16 ++++++++--------
 product/ERP5Form/GadgetField.py                  |  4 ++--
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testBlobSave.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testBlobSave.xml
index ab446097e2..c557543bdf 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testBlobSave.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testBlobSave.xml
@@ -93,13 +93,13 @@
 <!-- Initialize -->\n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//input[@title=\'my_file\']</td>\n
+  <td>//input[@title=\'field_my_file\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>type</td>\n
-  <td>//input[@title=\'my_file\']</td>\n
+  <td>//input[@title=\'field_my_file\']</td>\n
   <td>test</td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testNotDataURLException.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testNotDataURLException.xml
index 9fb58b476a..12be99e138 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testNotDataURLException.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testNotDataURLException.xml
@@ -94,7 +94,7 @@
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//input[@title=\'my_subject\']</td>\n
+  <td>//input[@title=\'field_my_subject\']</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -102,7 +102,7 @@
 \n
 <tr>\n
   <td>type</td>\n
-  <td>//input[@title=\'my_subject\']</td>\n
+  <td>//input[@title=\'field_my_subject\']</td>\n
   <td>couscous</td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testNotEditable.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testNotEditable.xml
index c72cbb9ddf..de245a4ab6 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testNotEditable.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testNotEditable.xml
@@ -94,7 +94,7 @@
 <!-- Initialize -->\n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//input[@title=\'my_language\']</td>\n
+  <td>//input[@title=\'field_my_language\']</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -102,7 +102,7 @@
 \n
 <tr>\n
   <td>type</td>\n
-  <td>//input[@title=\'my_language\']</td>\n
+  <td>//input[@title=\'field_my_language\']</td>\n
   <td>couscous</td>\n
 </tr>\n
 \n
@@ -122,14 +122,14 @@
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//input[@title=\'my_language\']</td>\n
+  <td>//input[@title=\'field_my_language\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 \n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>//input[@title=\'my_language\']</td>\n
+  <td>//input[@title=\'field_my_language\']</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testSaveAndLoad.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testSaveAndLoad.xml
index 2e4dcf69fc..4b0df8f359 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testSaveAndLoad.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testSaveAndLoad.xml
@@ -94,7 +94,7 @@
 <!-- Initialize -->\n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//input[@title=\'my_description\']</td>\n
+  <td>//input[@title=\'field_my_description\']</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -102,7 +102,7 @@
 \n
 <tr>\n
   <td>type</td>\n
-  <td>//input[@title=\'my_description\']</td>\n
+  <td>//input[@title=\'field_my_description\']</td>\n
   <td>123</td>\n
 </tr>\n
 \n
@@ -122,14 +122,14 @@
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//input[@title=\'my_description\']</td>\n
+  <td>//input[@title=\'field_my_description\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 \n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>//input[@title=\'my_description\']</td>\n
+  <td>//input[@title=\'field_my_description\']</td>\n
   <td>123</td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testSaveAndNotEditableInIFrame.xml b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testSaveAndNotEditableInIFrame.xml
index 02e548410f..84ef66f1da 100644
--- a/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testSaveAndNotEditableInIFrame.xml
+++ b/bt5/erp5_ui_test/PathTemplateItem/portal_tests/gadget_field_zuite/testSaveAndNotEditableInIFrame.xml
@@ -93,25 +93,25 @@
 <!-- Initialize -->\n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//input[@title=\'my_right\']</td>\n
+  <td>//input[@title=\'field_my_right\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//input[@title=\'my_format\']</td>\n
+  <td>//input[@title=\'field_my_format\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>type</td>\n
-  <td>//input[@title=\'my_right\']</td>\n
+  <td>//input[@title=\'field_my_right\']</td>\n
   <td>couscous</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>type</td>\n
-  <td>//input[@title=\'my_format\']</td>\n
+  <td>//input[@title=\'field_my_format\']</td>\n
   <td>couscous</td>\n
 </tr>\n
 \n
@@ -130,24 +130,24 @@
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//input[@title=\'my_right\']</td>\n
+  <td>//input[@title=\'field_my_right\']</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>waitForElementPresent</td>\n
-  <td>//input[@title=\'my_format\']</td>\n
+  <td>//input[@title=\'field_my_format\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>//input[@title=\'my_right\']</td>\n
+  <td>//input[@title=\'field_my_right\']</td>\n
   <td>couscous</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>verifyValue</td>\n
-  <td>//input[@title=\'my_format\']</td>\n
+  <td>//input[@title=\'field_my_format\']</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/product/ERP5Form/GadgetField.py b/product/ERP5Form/GadgetField.py
index dc39cfa884..bbee0ee8b1 100755
--- a/product/ERP5Form/GadgetField.py
+++ b/product/ERP5Form/GadgetField.py
@@ -30,7 +30,7 @@ class GadgetWidget(Widget.TextWidget):
   def render_view(self, field, value, REQUEST=None, render_prefix=None, key=None):
      kw = {}
      kw['data-gadget-url'] = field.get_value('gadget_url')
-     kw['data-gadget-scope'] = field.id
+     kw['data-gadget-scope'] = 'field_' + field.id
      if key is not None:
        kw['data-gadget-editable'] = key
      kw['class'] = "gadget"
@@ -62,4 +62,4 @@ class GadgetField(ZMIField):
     meta_type = "GadgetField"
 
     widget = GadgetWidgetInstance
-    validator = Validator.SuppressValidatorInstance
+    validator = Validator.FileValidatorInstance
-- 
2.30.9