Commit 989c44dc authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

fix a typo of activity dependency that may cause 'xxx has more than one applied rule.' problem.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27030 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c480f5d9
...@@ -57,21 +57,21 @@ ...@@ -57,21 +57,21 @@
\n \n
activate_kw = {}\n activate_kw = {}\n
related_order = packing_list.getCausalityValue()\n related_order = packing_list.getCausalityValue()\n
after_path_list = []\n after_tag_list = []\n
if related_order is not None:\n if related_order is not None:\n
after_path_list.append(related_order.getPath() + \'_firstUpdateAppliedRule\')\n after_tag_list.append(related_order.getPath() + \'_firstUpdateAppliedRule\')\n
after_path_list.append(related_order.getPath() + \'_expand\')\n after_tag_list.append(related_order.getPath() + \'_expand\')\n
tag = packing_list.getPath()+\'_expand\'\n tag = packing_list.getPath()+\'_expand\'\n
activate_kw = {\'tag\':tag,\'priority\':3}\n activate_kw = {\'tag\':tag,\'priority\':3}\n
\n \n
packing_list.activate(after_path=after_path_list,tag=tag,\n packing_list.activate(after_tag=after_tag_list,tag=tag,\n
priority=3).updateAppliedRule(rule_reference=\'default_delivery_rule\',activate_kw=activate_kw)\n priority=3).updateAppliedRule(rule_reference=\'default_delivery_rule\',activate_kw=activate_kw)\n
\n \n
\n \n
# Make sure to reindex related simulation movement if we are already\n # Make sure to reindex related simulation movement if we are already\n
# simulated, call reindexObject, not immediateReindexObject so that\n # simulated, call reindexObject, not immediateReindexObject so that\n
# catalogObjectList will be called with many objects\n # catalogObjectList will be called with many objects\n
packing_list.activate(after_path=after_path_list,tag=tag,\n packing_list.activate(after_tag=after_tag_list,tag=tag,\n
priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n
\n \n
packing_list.startBuilding()\n packing_list.startBuilding()\n
...@@ -121,7 +121,7 @@ packing_list.activate(\n ...@@ -121,7 +121,7 @@ packing_list.activate(\n
<string>activate_kw</string> <string>activate_kw</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>related_order</string> <string>related_order</string>
<string>after_path_list</string> <string>after_tag_list</string>
<string>None</string> <string>None</string>
<string>tag</string> <string>tag</string>
</tuple> </tuple>
......
391 392
\ No newline at end of file \ No newline at end of file
...@@ -61,21 +61,21 @@ packing_list = state_change[\'object\']\n ...@@ -61,21 +61,21 @@ packing_list = state_change[\'object\']\n
\n \n
activate_kw = {}\n activate_kw = {}\n
related_order = packing_list.getCausalityValue()\n related_order = packing_list.getCausalityValue()\n
after_path_list = []\n after_tag_list = []\n
if related_order is not None:\n if related_order is not None:\n
after_path_list.append(related_order.getPath() + \'_firstUpdateAppliedRule\')\n after_tag_list.append(related_order.getPath() + \'_firstUpdateAppliedRule\')\n
after_path_list.append(related_order.getPath() + \'_expand\')\n after_tag_list.append(related_order.getPath() + \'_expand\')\n
tag = packing_list.getPath()+\'_expand\'\n tag = packing_list.getPath()+\'_expand\'\n
activate_kw = {\'tag\':tag,\'priority\':3}\n activate_kw = {\'tag\':tag,\'priority\':3}\n
\n \n
packing_list.activate(after_path=after_path_list,tag=tag,\n packing_list.activate(after_tag=after_tag_list,tag=tag,\n
priority=3).updateAppliedRule(rule_id = \'default_delivery_rule\',activate_kw=activate_kw)\n priority=3).updateAppliedRule(rule_id = \'default_delivery_rule\',activate_kw=activate_kw)\n
\n \n
\n \n
# Make sure to reindex related simulation movement if we are already\n # Make sure to reindex related simulation movement if we are already\n
# simulated, call reindexObject, not immediateReindexObject so that\n # simulated, call reindexObject, not immediateReindexObject so that\n
# catalogObjectList will be called with many objects\n # catalogObjectList will be called with many objects\n
packing_list.activate(after_path=after_path_list,tag=tag,\n packing_list.activate(after_tag=after_tag_list,tag=tag,\n
priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n
\n \n
packing_list.startBuilding()\n packing_list.startBuilding()\n
...@@ -126,7 +126,7 @@ packing_list.activate(\n ...@@ -126,7 +126,7 @@ packing_list.activate(\n
<string>activate_kw</string> <string>activate_kw</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>related_order</string> <string>related_order</string>
<string>after_path_list</string> <string>after_tag_list</string>
<string>None</string> <string>None</string>
<string>tag</string> <string>tag</string>
</tuple> </tuple>
......
639 640
\ No newline at end of file \ No newline at end of file
...@@ -57,14 +57,14 @@ ...@@ -57,14 +57,14 @@
\n \n
activate_kw = {}\n activate_kw = {}\n
related_order = packing_list.getCausalityValue()\n related_order = packing_list.getCausalityValue()\n
after_path_list = []\n after_tag_list = []\n
if related_order is not None:\n if related_order is not None:\n
after_path_list.append(related_order.getPath() + \'_firstUpdateAppliedRule\')\n after_tag_list.append(related_order.getPath() + \'_firstUpdateAppliedRule\')\n
after_path_list.append(related_order.getPath() + \'_expand\')\n after_tag_list.append(related_order.getPath() + \'_expand\')\n
tag = packing_list.getPath()+\'_expand\'\n tag = packing_list.getPath()+\'_expand\'\n
activate_kw = {\'tag\':tag,\'priority\':3}\n activate_kw = {\'tag\':tag,\'priority\':3}\n
\n \n
packing_list.activate(after_path=after_path_list,\n packing_list.activate(after_tag=after_tag_list,\n
tag=tag,\n tag=tag,\n
priority=3).updateAppliedRule(rule_reference=\'default_delivery_rule\',\n priority=3).updateAppliedRule(rule_reference=\'default_delivery_rule\',\n
activate_kw=activate_kw)\n activate_kw=activate_kw)\n
...@@ -73,7 +73,7 @@ packing_list.activate(after_path=after_path_list,\n ...@@ -73,7 +73,7 @@ packing_list.activate(after_path=after_path_list,\n
# Make sure to reindex related simulation movement if we are already\n # Make sure to reindex related simulation movement if we are already\n
# simulated, call reindexObject, not immediateReindexObject so that\n # simulated, call reindexObject, not immediateReindexObject so that\n
# catalogObjectList will be called with many objects\n # catalogObjectList will be called with many objects\n
packing_list.activate(after_path=after_path_list,\n packing_list.activate(after_tag=after_tag_list,\n
tag=tag,\n tag=tag,\n
priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n priority=3).applyToDeliveryRelatedMovement(method_id=\'reindexObject\')\n
\n \n
...@@ -124,7 +124,7 @@ packing_list.activate(\n ...@@ -124,7 +124,7 @@ packing_list.activate(\n
<string>activate_kw</string> <string>activate_kw</string>
<string>_getattr_</string> <string>_getattr_</string>
<string>related_order</string> <string>related_order</string>
<string>after_path_list</string> <string>after_tag_list</string>
<string>None</string> <string>None</string>
<string>tag</string> <string>tag</string>
</tuple> </tuple>
......
641 642
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment