--- versionedFile/versionedFile.py 2005/01/12 14:08:19 1.25 +++ versionedFile/versionedFile.py 2005/03/03 13:09:30 1.29 @@ -162,6 +162,8 @@ class versionedFileFolder(Folder,ECHO_ba file2=file obj=ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type) + self.REQUEST.SESSION['objID']=ob.getId() + self.REQUEST.SESSION['objID_parent']=None if obj.getSize()==0: pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) @@ -169,6 +171,19 @@ class versionedFileFolder(Folder,ECHO_ba RESPONSE.redirect(self.REQUEST['URL1']) + + def deleteEmptyObject(self,submit,RESPONSE=None): + """deleteemptyobject""" + if submit=="delete it": + if self.REQUEST.SESSION['objID_parent']: + obj=getattr(self,self.REQUEST.SESSION['objID_parent']) + + else: + obj=self + obj.manage_delObjects([self.REQUEST.SESSION['objID']]) + + RESPONSE.redirect(self.REQUEST['URL1']) + manage_addVersionedFileFolderForm=DTMLFile('dtml/folderAdd', globals()) @@ -321,7 +336,24 @@ class versionedFile(Folder): meta_type="versionedFile" - + def manageCommentForm(self): + """add a comment""" + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addComment')).__of__(self) + return pt() + + def manageComment(self,text,comment_author,submit,REQUEST=None): + """manage comments""" + if submit =='change': + if text=='': + self.comment=None + else: + self.comment=text + self.comment_author=comment_author + + self.comment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime()) + + return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()) + def getLastVersion(self): """Last Version""" tmp=0 @@ -374,6 +406,11 @@ class versionedFile(Folder): ret.sort(sortv) return ret + security.declareProtected('AUTHENTICATED_USER','forceunlock') + def forceunlock(self,RESPONSE): + """unlock""" + self.lockedBy='' + security.declareProtected('AUTHENTICATED_USER','unlock') def unlock(self,RESPONSE): """unlock""" @@ -383,6 +420,7 @@ class versionedFile(Folder): else: return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) + security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm') @@ -418,10 +456,12 @@ class versionedFile(Folder): manage_addVersionedFileObject(self,id,vC,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type) objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) - + self.REQUEST.SESSION['objID_parent']=self.getId() if RESPONSE: - if self.ZopeFind(self,obj_ids=[id])[0][1].getSize()==0: + obj=self.ZopeFind(self,obj_ids=[id])[0][1] + if obj.getSize()==0: + self.REQUEST.SESSION['objID']=obj.getId() pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) return pt()