Commit 43093de5 authored by Sebastien Robin's avatar Sebastien Robin

allow to force the expand when updating the applied rule


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4048 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent a9c7e411
...@@ -465,7 +465,7 @@ class Delivery(XMLObject): ...@@ -465,7 +465,7 @@ class Delivery(XMLObject):
########################################################################## ##########################################################################
# Applied Rule stuff # Applied Rule stuff
def updateAppliedRule(self, rule_id): def updateAppliedRule(self, rule_id,force=0):
""" """
Create a new Applied Rule is none is related, or call expand Create a new Applied Rule is none is related, or call expand
on the existing one. on the existing one.
...@@ -474,9 +474,9 @@ class Delivery(XMLObject): ...@@ -474,9 +474,9 @@ class Delivery(XMLObject):
(self.getSimulationState() not in \ (self.getSimulationState() not in \
self.getPortalDraftOrderStateList()): self.getPortalDraftOrderStateList()):
# Nothing to do if we are already simulated # Nothing to do if we are already simulated
self._createAppliedRule(rule_id) self._createAppliedRule(rule_id,force=force)
def _createAppliedRule(self, rule_id): def _createAppliedRule(self, rule_id,force=0):
""" """
Create a new Applied Rule is none is related, or call expand Create a new Applied Rule is none is related, or call expand
on the existing one. on the existing one.
...@@ -518,7 +518,7 @@ class Delivery(XMLObject): ...@@ -518,7 +518,7 @@ class Delivery(XMLObject):
after_path_and_method_id=( after_path_and_method_id=(
my_applied_rule.getPath(), my_applied_rule.getPath(),
['immediateReindexObject', 'recursiveImmediateReindexObject']) ['immediateReindexObject', 'recursiveImmediateReindexObject'])
).expand(my_applied_rule.getId()) ).expand(my_applied_rule.getId(),force=force)
security.declareProtected(Permissions.ModifyPortalContent, 'expand') security.declareProtected(Permissions.ModifyPortalContent, 'expand')
def expand(self, applied_rule_id, force=0, **kw): def expand(self, applied_rule_id, force=0, **kw):
......
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