[Erp5-report] r43409 kazuhiko - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Feb 17 11:47:59 2011
New Revision: 43409

URL: http://svn.erp5.org?rev=43409&view=rev
Log:
skip installing for 'keep object' only if the object already exists.

Modified:
    erp5/trunk/products/ERP5/Document/BusinessTemplate.py

Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=43409&r1=43408&r2=43409&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Thu Feb 17 11:47:59 2011
@@ -999,10 +999,6 @@ class ObjectTemplateItem(BaseTemplateIte
             action = update_dict[path]
             if action == 'nothing':
               continue
-          elif context.isKeepObject(path):
-            # do nothing if the object is specified in keep list in
-            # force mode.
-            continue
           # get subobjects in path
           path_list = path.split('/')
           container_path = path_list[:-1]
@@ -1034,6 +1030,10 @@ class ObjectTemplateItem(BaseTemplateIte
           old_obj = container._getOb(object_id, None)
           object_existed = old_obj is not None
           if object_existed:
+            if context.isKeepObject(path):
+              # do nothing if the object is specified in keep list in
+              # force mode.
+              continue
             # Object already exists
             recurse(saveHook, old_obj)
             if getattr(aq_base(old_obj), 'groups', None) is not None: