Commit 46d30269 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

build() activity should wait for '(path)_updateAppliedRule' tag, otherwise it...

build() activity should wait for '(path)_updateAppliedRule' tag, otherwise it will be invoked too early.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35573 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f8d5a037
...@@ -71,11 +71,13 @@ builder = getattr(portal_deliveries,\n ...@@ -71,11 +71,13 @@ builder = getattr(portal_deliveries,\n
builder_by_portal_type[delivery_portal_type],\n builder_by_portal_type[delivery_portal_type],\n
None)\n None)\n
\n \n
expand_tag = \'%s_expand\' % delivery.getPath()\n path = delivery.getPath()\n
tag = \'%s_updateAppliedRule\' % path\n
expand_tag = \'%s_expand\' % path\n
build_tag = \'invoice_transaction_build_trade_model_%s\' % delivery.getRelativeUrl()\n build_tag = \'invoice_transaction_build_trade_model_%s\' % delivery.getRelativeUrl()\n
build_accounting_tag = \'invoice_transaction_build_accounting_%s\' % delivery.getRelativeUrl()\n build_accounting_tag = \'invoice_transaction_build_accounting_%s\' % delivery.getRelativeUrl()\n
\n \n
delivery.activate(after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=dict(tag=expand_tag))\n delivery.activate(tag=tag, after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=dict(tag=expand_tag))\n
\n \n
if builder is not None:\n if builder is not None:\n
explanation_uid_list = [delivery.getUid(), ]\n explanation_uid_list = [delivery.getUid(), ]\n
...@@ -92,7 +94,7 @@ if builder is not None:\n ...@@ -92,7 +94,7 @@ if builder is not None:\n
\n \n
builder.activate(\n builder.activate(\n
activity=\'SQLQueue\',\n activity=\'SQLQueue\',\n
after_tag=expand_tag,\n after_tag=(tag, expand_tag),\n
tag=build_tag,\n tag=build_tag,\n
activate_kw=dict(tag=build_tag)).build(activate_kw=dict(tag=build_tag),\n activate_kw=dict(tag=build_tag)).build(activate_kw=dict(tag=build_tag),\n
explanation_uid=explanation_uid_list)\n explanation_uid=explanation_uid_list)\n
...@@ -146,6 +148,8 @@ if builder is not None:\n ...@@ -146,6 +148,8 @@ if builder is not None:\n
<string>getattr</string> <string>getattr</string>
<string>None</string> <string>None</string>
<string>builder</string> <string>builder</string>
<string>path</string>
<string>tag</string>
<string>expand_tag</string> <string>expand_tag</string>
<string>build_tag</string> <string>build_tag</string>
<string>build_accounting_tag</string> <string>build_accounting_tag</string>
......
1222 1223
\ No newline at end of file \ No newline at end of file
...@@ -81,9 +81,9 @@ order.activate(tag=tag, after_tag=expand_tag).updateAppliedRule(rule_reuference= ...@@ -81,9 +81,9 @@ order.activate(tag=tag, after_tag=expand_tag).updateAppliedRule(rule_reuference=
\n \n
for i in xrange(len(builder_list)):\n for i in xrange(len(builder_list)):\n
if i > 0:\n if i > 0:\n
after_tag = [expand_tag, \'%s_builder_%s\' % (order_path, i-1)]\n after_tag = (tag, expand_tag, \'%s_builder_%s\' % (order_path, i-1))\n
else:\n else:\n
after_tag = expand_tag\n after_tag = (tag, expand_tag)\n
builder_list[i].activate(\n builder_list[i].activate(\n
activity=\'SQLQueue\',\n activity=\'SQLQueue\',\n
after_tag=after_tag,\n after_tag=after_tag,\n
......
442 443
\ No newline at end of file \ No newline at end of file
16 17
\ No newline at end of file \ No newline at end of file
...@@ -63,7 +63,7 @@ activate_kw = {\'tag\':expand_tag, \'priority\':3}\n ...@@ -63,7 +63,7 @@ activate_kw = {\'tag\':expand_tag, \'priority\':3}\n
task.activate(tag=tag, after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=activate_kw)\n task.activate(tag=tag, after_tag=expand_tag).Delivery_updateAppliedRule(activate_kw=activate_kw)\n
\n \n
delivery_builder = task.portal_deliveries.task_report_builder\n delivery_builder = task.portal_deliveries.task_report_builder\n
delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(explanation_uid=task.getUid())\n delivery_builder.activate(activity=\'SQLQueue\',after_tag=(tag, expand_tag)).build(explanation_uid=task.getUid())\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
763 764
\ No newline at end of file \ No newline at end of file
...@@ -70,7 +70,7 @@ builder_dict = {\n ...@@ -70,7 +70,7 @@ builder_dict = {\n
}\n }\n
delivery_builder = getattr(order.portal_deliveries, builder_dict[order_portal_type])\n delivery_builder = getattr(order.portal_deliveries, builder_dict[order_portal_type])\n
\n \n
delivery_builder.activate(activity=\'SQLQueue\',after_tag=expand_tag).build(explanation_uid=order.getUid())\n delivery_builder.activate(activity=\'SQLQueue\', after_tag=(tag, expand_tag)).build(explanation_uid=order.getUid())\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
945 946
\ 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