--- versionedFile/extVersionedFile.py 2007/09/14 15:08:02 1.12 +++ versionedFile/extVersionedFile.py 2007/11/23 18:51:39 1.17 @@ -555,6 +555,9 @@ class extVersionedFileFolder(Folder,ECHO """fix last version number of all files""" for (id,vf) in self.getVersionedFiles(): vf.fixVersionNumbers() + # recursively + for (id,vf) in self.objectItems(self.meta_type): + vf.fixVersionNumbers() manage_addextVersionedFileFolderForm=DTMLFile('dtml/extfolderAdd', globals()) @@ -770,8 +773,12 @@ class extVersionedFile(CatalogAware,Fold meta_type = 'extVersionedFile' # meta_type of contained objects content_meta_type = ['extVersionedFileObject'] + # default catalog for extVersionedFile objects default_catalog = 'fileCatalog' + manage_options = Folder.manage_options+({'label':'Main Config','action':'changeVersionedFileForm'},) + + security=ClassSecurityInfo() def __init__(self, id, title, lockedBy,author): @@ -918,7 +925,8 @@ class extVersionedFile(CatalogAware,Fold def getContentObject(self): """returns the last version object""" - if not self.lastVersionId: + if not hasattr(self, 'lastVersionId'): + # find last version and save it lv = self.findLastVersion() if lv is None: return None @@ -1119,13 +1127,34 @@ class extVersionedFile(CatalogAware,Fold else: return ob + + changeVersionedFileForm = PageTemplateFile('zpt/changeVersionedFile', globals()) + + def manage_changeVersionedFile(self,title,vC,author,comment,RESPONSE=None): + """Change VersionedFile metadata""" + self.title = title + self.author = author + cob = self.getContentObject() + if cob: + if vC: + cob.vComment=vC + + if comment=='': + cob.versionComment=None + else: + cob.versionComment=comment + + if RESPONSE: + RESPONSE.redirect('manage_main') + def download(self): - """download and lock""" + """download""" self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getContentObject().getId()) self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") self.content_type="application/octet-stream" self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getContentObject().getId()) + security.declareProtected('AUTHENTICATED_USER','downloadLocked') def downloadLocked(self):