[Erp5-report] r43460 ivan - in /erp5/trunk/bt5/erp5_knowledge_pad: SkinTemplateItem/portal_...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Feb 18 09:57:47 CET 2011


Author: ivan
Date: Fri Feb 18 09:57:47 2011
New Revision: 43460

URL: http://svn.erp5.org?rev=43460&view=rev
Log:
Use field_prefix concept introduced in r43459

Modified:
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_generateAjaxCall.xml
    erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
    erp5/trunk/bt5/erp5_knowledge_pad/bt/revision

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_generateAjaxCall.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_generateAjaxCall.xml?rev=43460&r1=43459&r2=43460&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_generateAjaxCall.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/KnowledgePad_generateAjaxCall.xml [utf8] Fri Feb 18 09:57:47 2011
@@ -65,8 +65,8 @@ if editable_mode:\n
 else:\n
   editable_mode = 0\n
 \n
-js_update_code = """updater(\'%s\', \'%s\', \'%s\', \'%s\', %s);""" %(url, box_relative_url, dom_id, \n
-                                                              editable_mode, encodeInJson(params))\n
+js_update_code = """updater(\'%s\', \'%s\', \'%s\', \'%s\', %s, field_prefix=\'%s\');""" %(url, box_relative_url, dom_id, \n
+                                                              editable_mode, encodeInJson(params), field_prefix)\n
 if box.getValidationState()==\'invisible\':\n
   # we can generate \n
   javascript_code = """invisible_gadgets["%s"]="%s";""" %(dom_id, js_update_code)\n
@@ -78,7 +78,7 @@ return javascript_code\n
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>url, box, dom_id, params={}, ignore_security_check=0</string> </value>
+            <value> <string>url, box, dom_id, params={}, ignore_security_check=0, field_prefix=\'\'</string> </value>
         </item>
         <item>
             <key> <string>id</string> </key>

Modified: erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml?rev=43460&r1=43459&r2=43460&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/SkinTemplateItem/portal_skins/erp5_knowledge_pad/erp5_knowledge_box.js.xml [utf8] Fri Feb 18 09:57:47 2011
@@ -12,7 +12,7 @@
         </item>
         <item>
             <key> <string>_EtagSupport__etag</string> </key>
-            <value> <string>ts97860745.08</string> </value>
+            <value> <string>ts98018584.53</string> </value>
         </item>
         <item>
             <key> <string>__name__</string> </key>
@@ -76,7 +76,7 @@ function createCookie(name, value, days,
 }\n
 \n
 function updater(url, box_relative_url, dom_id, \n
-                 editable_mode, additionnal_request_params){\n
+                 editable_mode, additionnal_request_params, field_prefix){\n
   /* Get content from server */\n
   request_params = {};\n
   additionnal_request_params = typeof(additionnal_request_params) != \'undefined\' ? additionnal_request_params : [];\n
@@ -105,6 +105,16 @@ function updater(url, box_relative_url, 
   \n
   input_list.each(extractHiddenInputs);\n
 \n
+  // we can have a field_prefix which allows multiple gadgets within same HTML form\n
+  if (field_prefix){\n
+    $.each(request_params,  \n
+         function (key, value){\n
+           if (key.match("^"+field_prefix)){\n
+             delete request_params[key];\n
+             request_params[key.replace(field_prefix,\'\')] = value;\n
+           }});\n
+  }\n
+  \n
   // getting parameters for request from the parameter additionnal_request_params\n
   $.each(additionnal_request_params,  \n
          function (key, value){request_params[key] = additionnal_request_params[key];});\n
@@ -112,7 +122,7 @@ function updater(url, box_relative_url, 
   request_params["box_relative_url"] = box_relative_url;\n
   request_params["is_gadget_mode:int"] = 1; \n
   request_params["editable_mode:int"] = editable_mode; \n
-  \n
+\n
   // set transperancy to show an activity is going on\n
   $("#" + dom_id).css("opacity", 0.5);\n
   $.ajax({url:url,\n
@@ -487,7 +497,7 @@ $(document).ready(initialize);\n
         </item>
         <item>
             <key> <string>size</string> </key>
-            <value> <int>18091</int> </value>
+            <value> <int>18445</int> </value>
         </item>
         <item>
             <key> <string>title</string> </key>

Modified: erp5/trunk/bt5/erp5_knowledge_pad/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_knowledge_pad/bt/revision?rev=43460&r1=43459&r2=43460&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_knowledge_pad/bt/revision [utf8] Fri Feb 18 09:57:47 2011
@@ -1 +1 @@
-694
\ No newline at end of file
+696
\ No newline at end of file



More information about the Erp5-report mailing list