[Erp5-report] r27545 - in /erp5/trunk/bt5/erp5_item: SkinTemplateItem/portal_skins/erp5_ite...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Jun 12 16:38:28 CEST 2009


Author: mame
Date: Fri Jun 12 16:38:25 2009
New Revision: 27545

URL: http://svn.erp5.org?rev=27545&view=rev
Log:
2009-06-12 mame
*add ExternalValidation script to create only one reference for Item

Added:
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml
Modified:
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
    erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml
    erp5/trunk/bt5/erp5_item/bt/revision

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml?rev=27545&r1=27544&r2=27545&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_createItemList.xml [utf8] Fri Jun 12 16:38:25 2009
@@ -90,23 +90,14 @@
 for line in kw.get(\'listbox\'):\n
 \n
   if line.has_key(\'listbox_key\') and (line[\'title\'] or line[\'reference\'] not in (\'\', None)):\n
-    item = context.portal_catalog.getResultValue(\n
-                                    portal_type=\'Item\',\n
-                                    reference=line[\'reference\'])\n
-    if item is not None:\n
-      msg = translateString("Reference Defined On Line ${line_id} already exists",\n
-                                                    mapping={\'line_id\': line[\'listbox_key\']})\n
-      raise NotImplementedError(\n
-          msg)\n
-    else:\n
-      module = context.getDefaultModule(item_portal_type)\n
-      item = module.newContent(portal_type=item_portal_type,\n
-       title=line[\'title\'],\n
-       reference=line[\'reference\'],\n
-       quantity=line[\'quantity\'],\n
-       quantity_unit=context.getQuantityUnit(),\n
-       **item_property_dict)\n
-      item.validate()\n
+    module = context.getDefaultModule(item_portal_type)\n
+    item = module.newContent(portal_type=item_portal_type,\n
+     title=line[\'title\'],\n
+     reference=line[\'reference\'],\n
+     quantity=line[\'quantity\'],\n
+     quantity_unit=context.getQuantityUnit(),\n
+     **item_property_dict)\n
+    item.validate()\n
     \n
     line_variation_category_list = []\n
     for variation in (\n
@@ -232,11 +223,9 @@
                             <string>base_id</string>
                             <string>line</string>
                             <string>None</string>
-                            <string>item</string>
-                            <string>msg</string>
-                            <string>NotImplementedError</string>
                             <string>module</string>
                             <string>_apply_</string>
+                            <string>item</string>
                             <string>line_variation_category_list</string>
                             <string>variation</string>
                             <string>cell_found</string>
@@ -247,6 +236,7 @@
                             <string>movement</string>
                             <string>quantity</string>
                             <string>len</string>
+                            <string>NotImplementedError</string>
                             <string>_inplacevar_</string>
                           </tuple>
                         </value>

Added: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml?rev=27545&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml (added)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_validateItemCreationDialogReference.xml [utf8] Fri Jun 12 16:38:25 2009
@@ -1,0 +1,135 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <tuple>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>result = [x.getObject() for x in context.portal_catalog(portal_type = request.get("field_your_type"),\n
+            reference= request.get(\'field_listbox_reference_%s\' % request.cell.uid))]\n
+if editor and result !=[]:\n
+  return False\n
+return True\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>editor, request</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>2</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>editor</string>
+                            <string>request</string>
+                            <string>append</string>
+                            <string>$append0</string>
+                            <string>_getiter_</string>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                            <string>x</string>
+                            <string>result</string>
+                            <string>False</string>
+                            <string>True</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>DeliveryLine_validateItemCreationDialogReference</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

Modified: erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml?rev=27545&r1=27544&r2=27545&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/SkinTemplateItem/portal_skins/erp5_item/DeliveryLine_viewItemCreationDialog/listbox_reference.xml [utf8] Fri Jun 12 16:38:25 2009
@@ -13,8 +13,17 @@
             <key> <string>delegated_list</string> </key>
             <value>
               <list>
+                <string>display_width</string>
+                <string>external_validator</string>
                 <string>title</string>
-                <string>display_width</string>
+              </list>
+            </value>
+        </item>
+        <item>
+            <key> <string>delegated_message_list</string> </key>
+            <value>
+              <list>
+                <string>external_validator_failed</string>
               </list>
             </value>
         </item>
@@ -28,7 +37,7 @@
               <dictionary>
                 <item>
                     <key> <string>external_validator_failed</string> </key>
-                    <value> <string>The input failed the external validator.</string> </value>
+                    <value> <string>The input failed the external validator because the reference already exists</string> </value>
                 </item>
               </dictionary>
             </value>
@@ -80,6 +89,12 @@
                     <value> <int>20</int> </value>
                 </item>
                 <item>
+                    <key> <string>external_validator</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+                    </value>
+                </item>
+                <item>
                     <key> <string>field_id</string> </key>
                     <value> <string>my_string_field</string> </value>
                 </item>
@@ -101,4 +116,20 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <tuple>
+        <global name="Method" module="Products.Formulator.MethodField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>method_name</string> </key>
+            <value> <string>DeliveryLine_validateItemCreationDialogReference</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>

Modified: erp5/trunk/bt5/erp5_item/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_item/bt/revision?rev=27545&r1=27544&r2=27545&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_item/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_item/bt/revision [utf8] Fri Jun 12 16:38:25 2009
@@ -1,1 +1,1 @@
-168
+169




More information about the Erp5-report mailing list