--- versionedFile/versionedFile.py 2005/02/24 17:13:27 1.26 +++ versionedFile/versionedFile.py 2005/02/24 18:07:41 1.27 @@ -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()) @@ -435,10 +450,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()