Commit e25fe58d authored by Romain Courteaud's avatar Romain Courteaud

_edit was defined twice.

Merged them (thx Jerome).


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3592 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e85d5443
...@@ -288,17 +288,26 @@ class DeliveryCell(MappedValue, Movement): ...@@ -288,17 +288,26 @@ class DeliveryCell(MappedValue, Movement):
new_predicate_value = map(lambda c: update_method(c, previous_category_url, new_category_url), predicate_value) new_predicate_value = map(lambda c: update_method(c, previous_category_url, new_category_url), predicate_value)
self._setPredicateValueList(new_predicate_value) # No reindex needed since uid stable self._setPredicateValueList(new_predicate_value) # No reindex needed since uid stable
security.declarePrivate( '_edit' ) # XXX FIXME: option variation are today not well implemented
def _edit(self, REQUEST=None, force_update = 0, reindex_object = 0, **kw): # This little hack is needed to make the matrixbox working
# in DeliveryLine_viewIndustrialPhase
# Generic form (DeliveryLine_viewOption) is required
security.declarePrivate('_edit')
def _edit(self, REQUEST=None, force_update=0, reindex_object=0, **kw):
""" """
Store variation_category_list, in order to store new value of
industrial_phase after.
""" """
MappedValue._edit(self, REQUEST=REQUEST, force_update = force_update, if kw.has_key('variation_category_list'):
self._setVariationCategoryList(kw['variation_category_list'])
kw.pop('variation_category_list')
MappedValue._edit(self, REQUEST=REQUEST, force_update=force_update,
reindex_object=reindex_object, **kw) reindex_object=reindex_object, **kw)
# if self.isSimulated(): # if self.isSimulated():
# self.getRootDeliveryValue().activate().propagateResourceToSimulation() # self.getRootDeliveryValue().activate().propagateResourceToSimulation()
# This one must be the last # This one must be the last
if kw.has_key('item_id_list'): if kw.has_key('item_id_list'):
self._setItemIdList( kw['item_id_list'] ) self._setItemIdList(kw['item_id_list'])
security.declareProtected(Permissions.ModifyPortalContent, 'updateSimulationDeliveryProperties') security.declareProtected(Permissions.ModifyPortalContent, 'updateSimulationDeliveryProperties')
def updateSimulationDeliveryProperties(self, movement_list = None): def updateSimulationDeliveryProperties(self, movement_list = None):
...@@ -311,19 +320,3 @@ class DeliveryCell(MappedValue, Movement): ...@@ -311,19 +320,3 @@ class DeliveryCell(MappedValue, Movement):
parent = parent.getParent() parent = parent.getParent()
if parent is not None: if parent is not None:
parent.updateSimulationDeliveryProperties(movement_list, self) parent.updateSimulationDeliveryProperties(movement_list, self)
# XXX FIXME: option variation are today not well implemented
# This little hack is needed to make the matrixbox working
# in DeliveryLine_viewIndustrialPhase
# Generic form (DeliveryLine_viewOption) is required
security.declareProtected(Permissions.ModifyPortalContent,
'_edit')
def _edit(self, **kw):
"""
Store variation_category_list, in order to store new value of
industrial_phase after.
"""
if kw.has_key('variation_category_list'):
self._setVariationCategoryList(kw['variation_category_list'])
kw.pop('variation_category_list')
MappedValue._edit(self, **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