--- versionedFile/extVersionedFile.py 2008/06/26 16:38:25 1.20 +++ versionedFile/extVersionedFile.py 2008/08/08 16:19:26 1.25 @@ -613,6 +613,13 @@ class extVersionedFileObject(ExtFile): self.time = time self.author = author + security.declareProtected('manage','changeObject') + def changeObject(self,**args): + """modify any of the objects attributes""" + for arg in args: + if hasattr(self, arg): + logging.debug("changeObject %s: %s=%s"%(repr(self),arg,args[arg])) + setattr(self, arg, args[arg]) security.declarePublic('getTitle') def getTitle(self): @@ -790,6 +797,8 @@ class extVersionedFile(CatalogAware,Fold self.id=id self.title=title self.lockedBy=lockedBy + if self.lockedBy is None: + self.lockedBy = '' self.author=author self.lastVersionNumber=0 self.lastVersionId=None @@ -889,6 +898,8 @@ class extVersionedFile(CatalogAware,Fold def getLockedBy(self): """get locked by""" + if self.lockedBy is None: + self.lockedBy = '' return str(self.lockedBy) def getLastVersionNumber(self): @@ -1022,12 +1033,14 @@ class extVersionedFile(CatalogAware,Fold """get a list of dicts with author, comment, filename, etc, of all versions""" vl = [] for v in self.objectValues(self.content_meta_type): - vl.append({'versionNumber':v.get('versionNumber',0), + vl.append({'versionNumber':getattr(v,'versionNumber',0), 'title':v.getTitle(), + 'id':v.getId(), 'date':v.getTime(), - 'editor':v.getLastEditor(), - 'comment':v.get('versionComment','') + 'author':getattr(v,'author',''), + 'comment':getattr(v,'versionComment','') }) + return vl security.declareProtected('AUTHENTICATED_USER','forceunlock') def forceunlock(self,RESPONSE=None):