Changeset 1087

Timestamp:

06.07.2010 06:25:07 (19 months ago)

Author:

zmsdev

Message:

Applied minor fixes for update from older releases (required by uni-be).

Location:

ZMS/trunk

Files:

• _objattrs.py (modified) (2 diffs)
• zms.py (modified) (7 diffs)

ZMS/trunk/_objattrs.py

@@ -33 +33 @@
 import _blobfields
 import _globals
+import ZMSMetaobjManager
 
 
@@ -1286 +1287 @@
     def synchronizeObjAttr(self, attr):
       try:
-        if attr['type'] in self.metaobj_manager.valid_types:
+        if attr['type'] in ZMSMetaobjManager.ZMSMetaobjManager.valid_types:
           dct = {}
           dct['id'] = attr['id']

ZMS/trunk/zms.py

@@ -34 +34 @@
 import sys
 import time
+import transaction
 import urllib
 # Product imports.
@@ -217 +218 @@
                 self.metaobj_manager.setMetaobjAttr(dst_meta_type,None,metaDictId,'',0,0,0,metaDictId,zms_system=int(metaObj.get('zms_system',0) and metaDictAttr.get('zms_system',0)))
               except:
-                print "[recurse_updateVersionBuild]: can't setMetaobjAttr",self.getHome().id,dst_meta_type,None,metaDictId
+                print self.getLangFmtDate(time.time()),"[recurse_updateVersionBuild]: can't setMetaobjAttr",self.getHome().id,dst_meta_type,None,metaDictId
         try:
           del metaDictAttr['dst_meta_types']
@@ -269 +270 @@
           else:
             self.metaobj_manager.acquireMetaobj( 'com.zms.foundation',subobjects=0)
-            print "[recurse_updateVersionBuild]: can't acquire standard-objects for",self.getHome().id
+            print self.getLangFmtDate(time.time()),"[recurse_updateVersionBuild]: can't acquire standard-objects for",self.getHome().id
             c = 0
             for attr in attrs:
               if attrs[c] != attrsMaster[c]:
-                print "[recurse_updateVersionBuild]: diff",attrs[c]['id'],self.difference_list(attrs[c]['attrs'],attrsMaster[c]['attrs']),self.difference_list(attrsMaster[c]['attrs'],attrs[c]['attrs'])
+                print self.getLangFmtDate(time.time()),"[recurse_updateVersionBuild]: diff",attrs[c]['id'],self.difference_list(attrs[c]['attrs'],attrsMaster[c]['attrs']),self.difference_list(attrsMaster[c]['attrs'],attrs[c]['attrs'])
               else:
                 self.metaobj_manager.acquireMetaobj( attrs[c]['id'])
@@ -303 +304 @@
         self.manage_renameObject( id=old_id, new_id=new_id)
       except:
-        print "[recurse_updateVersionBuild]: can't rename original-object", old_id, new_id
+        print self.getLangFmtDate(time.time()),"[recurse_updateVersionBuild]: can't rename original-object", old_id, new_id
         recurse_cleanArtefacts( self)
         self.manage_renameObject( id=old_id, new_id=new_id)
@@ -331 +332 @@
             new_ob.manage_pasteObjects( cb_copy_data)
           except:
-            print "[recurse_updateVersionBuild]: ", new_ob.meta_id, new_ob.absolute_url(), "Can't paste", id
+            print self.getLangFmtDate(time.time()),"[recurse_updateVersionBuild]: ", new_ob.meta_id, new_ob.absolute_url(), "Can't paste", id
       # Roles.
       role_permissions = {}
@@ -913 +914 @@
         _globals.writeBlock(self,'[ZMS.updateVersion]: Synchronize object-model from build #%s%s to #%s%s - Finished!'%(build,patch,self.zms_build,self.zms_patch))
         setattr( self, 'build', self.zms_build)
+        transaction.commit()
         message += 'Synchronized object-model from build #%s%s to #%s%s!<br/>'%(build,patch,self.zms_build,self.zms_patch)
       if build != self.zms_build or patch != self.zms_patch:
@@ -920 +922 @@
         _globals.writeBlock(self,'[ZMS.updateVersion]: Synchronize object-model from patch #%s%s to #%s%s - Finished!'%(build,patch,self.zms_build,self.zms_patch))
         setattr( self, 'patch', self.zms_patch)
+        transaction.commit()
         message += 'Synchronized object-model from patch #%s%s to #%s%s!<br/>'%(build,patch,self.zms_build,self.zms_patch)
       if maintenance: