[Erp5-report] r23669 - in /erp5/trunk/products/ERP5: ./ Document/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 17 12:08:25 CEST 2008
Author: kazuhiko
Date: Wed Sep 17 12:08:17 2008
New Revision: 23669
URL: http://svn.erp5.org?rev=23669&view=rev
Log:
rename from testToUpdate() to test().
Modified:
erp5/trunk/products/ERP5/Document/BaseVariantMovementGroup.py
erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py
erp5/trunk/products/ERP5/Document/CausalityAssignmentMovementGroup.py
erp5/trunk/products/ERP5/Document/CausalityMovementGroup.py
erp5/trunk/products/ERP5/Document/MovementGroup.py
erp5/trunk/products/ERP5/Document/OrderBuilder.py
erp5/trunk/products/ERP5/Document/OrderMovementGroup.py
erp5/trunk/products/ERP5/Document/ParentExplanationMovementGroup.py
erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py
erp5/trunk/products/ERP5/Document/QuantitySignMovementGroup.py
erp5/trunk/products/ERP5/Document/RequirementMovementGroup.py
erp5/trunk/products/ERP5/Document/RootAppliedRuleCausalityMovementGroup.py
erp5/trunk/products/ERP5/Document/SplitMovementGroup.py
erp5/trunk/products/ERP5/Document/TitleMovementGroup.py
erp5/trunk/products/ERP5/Document/VariantMovementGroup.py
erp5/trunk/products/ERP5/MovementGroup.py
Modified: erp5/trunk/products/ERP5/Document/BaseVariantMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BaseVariantMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BaseVariantMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/BaseVariantMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -44,13 +44,6 @@
property_dict['_base_category_list'] = category_list
return property_dict
- def test(self, object, property_dict):
- category_list = object.getVariationBaseCategoryList()
- if category_list is None:
- category_list = []
- category_list.sort()
- return property_dict['_base_category_list'] == category_list
-
- def testToUpdate(self, object, property_dict, **kw):
+ def test(self, object, property_dict, **kw):
# This movement group does not affect updating.
return True, {}
Modified: erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/CategoryMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -41,7 +41,8 @@
def _getPropertyDict(self, movement, **kw):
property_dict = {}
for prop in self.getTestedPropertyList():
- property_dict['%s_list' % prop] = movement.getPropertyList(prop, None)
+ property_dict['%s_list' % prop] = sorted(
+ movement.getPropertyList(prop, None))
return property_dict
def test(self, object, property_dict, property_list=None, **kw):
@@ -51,7 +52,7 @@
else:
target_property_list = self.getTestedPropertyList()
for prop in target_property_list:
- if sorted(property_dict['%s_list' % prop]) != \
+ if property_dict['%s_list' % prop] != \
sorted(object.getPropertyList(prop, None)):
- return False
- return True
+ return False, property_dict
+ return True, property_dict
Modified: erp5/trunk/products/ERP5/Document/CausalityAssignmentMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/CausalityAssignmentMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/CausalityAssignmentMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/CausalityAssignmentMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -47,7 +47,7 @@
self._addCausalityToEdit(movement, property_dict)
return [[movement_list, property_dict]]
- def testToUpdate(self, movement, property_dict, **kw):
+ def test(self, movement, property_dict, **kw):
# We can always update.
return True, property_dict
Modified: erp5/trunk/products/ERP5/Document/CausalityMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/CausalityMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/CausalityMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/CausalityMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -42,7 +42,7 @@
property_dict['_explanation'] = explanation_relative_url
return property_dict
- def testToUpdate(self, movement, property_dict, **kw):
+ def test(self, movement, property_dict, **kw):
# we don't care the difference of explanation url when updating
#return True, property_dict
return True, {}
Modified: erp5/trunk/products/ERP5/Document/MovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/MovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/MovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/MovementGroup.py Wed Sep 17 12:08:17 2008
@@ -54,6 +54,10 @@
# This method should be defined in sub classes.
raise NotImplementedError
+ def test(self, object, property_dict, **kw):
+ # This method should be defined in sub classes.
+ raise NotImplementedError
+
def _separate(self, movement_list):
# By default, we separate movements by _getPropertyDict() values.
# You can override this method in each MovementGroup class.
@@ -75,12 +79,3 @@
return sorted([[sorted(x[0], lambda a,b:cmp(a.getId(), b.getId())), x[1]] \
for x in self._separate(movement_list)],
lambda a,b: cmp(a[0][0].getId(), b[0][0].getId()))
-
- def test(self, object, property_dict, **kw):
- raise NotImplementedError
-
- def testToUpdate(self, object, property_dict, **kw):
- if self.test(object, property_dict, **kw):
- return True, property_dict
- else:
- return False, property_dict
Modified: erp5/trunk/products/ERP5/Document/OrderBuilder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderBuilder.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderBuilder.py (original)
+++ erp5/trunk/products/ERP5/Document/OrderBuilder.py Wed Sep 17 12:08:17 2008
@@ -235,12 +235,12 @@
my_root_group.append(movement_list)
return my_root_group
- def _testToUpdate(self, instance, movement_group_list,
+ def _test(self, instance, movement_group_list,
divergence_list):
result = True
new_property_dict = {}
for movement_group in movement_group_list:
- tmp_result, tmp_property_dict = movement_group.testToUpdate(
+ tmp_result, tmp_property_dict = movement_group.test(
instance, divergence_list)
if tmp_result == False:
result = tmp_result
@@ -266,7 +266,7 @@
instance_list.sort(lambda a,b:cmp(b.getId()==original_id,
a.getId()==original_id))
for instance_to_update in instance_list:
- result, property_dict = self._testToUpdate(
+ result, property_dict = self._test(
instance_to_update, movement_group_list, divergence_list)
if result == True:
instance = instance_to_update
Modified: erp5/trunk/products/ERP5/Document/OrderMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/OrderMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/OrderMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/OrderMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -44,7 +44,7 @@
property_dict['causality'] = order_relative_url
return property_dict
- def testToUpdate(self, movement, property_dict, **kw):
+ def test(self, movement, property_dict, **kw):
if movement.getCausality() == property_dict['causality']:
return True, property_dict
else:
Modified: erp5/trunk/products/ERP5/Document/ParentExplanationMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/ParentExplanationMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/ParentExplanationMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/ParentExplanationMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -45,6 +45,9 @@
property_dict['parent_explanation_value'] = parent_explanation_value
return property_dict
- def test(self, object, property_dict, property_list=None, **kw):
- return object.getParentExplanationValue() == \
- property_dict['parent_explanation_value']
+ def test(self, object, property_dict, **kw):
+ if object.getParentExplanationValue() == \
+ property_dict['parent_explanation_value']:
+ return True, property_dict
+ else:
+ return False, property_dict
Modified: erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/PropertyMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -52,5 +52,5 @@
target_property_list = self.getTestedPropertyList()
for prop in target_property_list:
if property_dict[prop] != object.getProperty(prop, None):
- return False
- return True
+ return False, property_dict
+ return True, property_dict
Modified: erp5/trunk/products/ERP5/Document/QuantitySignMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/QuantitySignMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/QuantitySignMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/QuantitySignMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -65,17 +65,6 @@
]
def test(self, object, property_dict, **kw):
- quantity = object.getQuantity()
- sign1 = property_dict['quantity_sign']
- sign2 = cmp(quantity, 0)
- if sign2 == 0:
- return 1
- if sign1 == 0:
- property_dict['quantity_sign'] = sign2
- return 1
- return sign1 == sign2
-
- def testToUpdate(self, object, property_dict, **kw):
if object.getQuantitySign() == property_dict['quantity_sign']:
return True, property_dict
else:
Modified: erp5/trunk/products/ERP5/Document/RequirementMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/RequirementMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/RequirementMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/RequirementMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -38,7 +38,7 @@
def _getPropertyDict(self, movement, **kw):
return {'requirement':self._getRequirementList(movement)}
- def testToUpdate(self, movement, property_dict, **kw):
+ def test(self, movement, property_dict, **kw):
# We can always update
return True, property_dict
Modified: erp5/trunk/products/ERP5/Document/RootAppliedRuleCausalityMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/RootAppliedRuleCausalityMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/RootAppliedRuleCausalityMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/RootAppliedRuleCausalityMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -44,7 +44,7 @@
property_dict['root_causality_value_list'] = [root_causality_value]
return property_dict
- def testToUpdate(self, movement, property_dict, **kw):
+ def test(self, movement, property_dict, **kw):
# We can always update
return True, property_dict
Modified: erp5/trunk/products/ERP5/Document/SplitMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SplitMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SplitMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/SplitMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -38,7 +38,7 @@
def _getPropertyDict(self, movement, **kw):
return {}
- def testToUpdate(self, object, property_dict, **kw):
+ def test(self, object, property_dict, **kw):
return True, property_dict
def _separate(self, movement_list):
Modified: erp5/trunk/products/ERP5/Document/TitleMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/TitleMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/TitleMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/TitleMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -41,9 +41,6 @@
return property_dict
def test(self, object, property_dict, **kw):
- return self._getTitle(object) == property_dict['title']
-
- def testToUpdate(self, object, property_dict, **kw):
# If title is different, we want to update existing object instead
# of creating a new one.
return True, property_dict
Modified: erp5/trunk/products/ERP5/Document/VariantMovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/VariantMovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/VariantMovementGroup.py (original)
+++ erp5/trunk/products/ERP5/Document/VariantMovementGroup.py Wed Sep 17 12:08:17 2008
@@ -49,4 +49,7 @@
if category_list is None:
category_list = []
category_list.sort()
- return property_dict['variation_category_list'] == category_list
+ if property_dict['variation_category_list'] == category_list:
+ return True, property_dict
+ else:
+ return False, property_dict
Modified: erp5/trunk/products/ERP5/MovementGroup.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/MovementGroup.py?rev=23669&r1=23668&r2=23669&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/MovementGroup.py (original)
+++ erp5/trunk/products/ERP5/MovementGroup.py Wed Sep 17 12:08:17 2008
@@ -132,7 +132,7 @@
else:
return movement
- def testToUpdate(self, movement, divergence_list):
+ def test(self, movement, divergence_list):
# Try to check if movement is updatable or not.
#
# 1. if Divergence has no scope: update anyway.
@@ -155,7 +155,7 @@
if not len(related_divergence_list):
return True, {}
property_list = [x.tested_property for x in related_divergence_list]
- return self._movement_group.testToUpdate(movement, self._property_dict,
+ return self._movement_group.test(movement, self._property_dict,
property_list=property_list)
else:
return True, {}
More information about the Erp5-report
mailing list