--- versionedFile/versionedFile.py 2005/07/04 10:59:03 1.39 +++ versionedFile/versionedFile.py 2005/08/15 09:48:35 1.42 @@ -1,3 +1,4 @@ + from OFS.Folder import Folder from OFS.Image import File from OFS.Image import cookId @@ -349,7 +350,9 @@ class versionedFileFolder(Folder,ECHO_ba return ext[0][1]() else: return "" - + + + security.declareProtected('View','index_html') def index_html(self): """main""" ext=self.ZopeFind(self,obj_ids=["index.html"]) @@ -457,7 +460,7 @@ class versionedFileObject(File): manage_editForm =DTMLFile('dtml/fileEdit',globals(), Kind='File',kind='file') manage_editForm._setName('manage_editForm') - + security= ClassSecurityInfo() def getVComment(self): """get the comment of this file""" @@ -493,7 +496,7 @@ class versionedFileObject(File): return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer']) return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history") - + security.declarePublic('getTime') def getTime(self): """getTime""" #return self.bobobase_modification_time().ISO() @@ -538,12 +541,18 @@ class versionedFileObject(File): """set version""" self.versionNumber=versionNumber + security.declarePublic('getVersionNumber') def getVersionNumber(self): """get version""" return self.versionNumber + security.declarePublic('getVersionComment') + def getVersionComment(self): + """get version""" + return self.versionComment + - + security.declarePublic('lastEditor') def lastEditor(self): """last Editor""" if hasattr(self,'author'): @@ -611,18 +620,25 @@ class versionedFile(Folder): def manageImagesForm(self): """manage Images attached to the file""" + + self.REQUEST.SESSION['refer']=self.REQUEST['HTTP_REFERER'] + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','manageImage')).__of__(self) return pt() - def manageImages(self,imageUrl=None,caption=None,RESPONSE=None): + def manageImages(self,imageUrl=None,caption=None,REQUEST=None): """manage URL""" if imageUrl and (not imageUrl==""): manage_AddImageZogiLib(self,libPath=imageUrl,caption=caption) - - if RESPONSE is not None: - RESPONSE.redirect('../../') - def changeImages(self,caption=None,submit=None,id=None,RESPONSE=None): + if self.REQUEST.SESSION.has_key('refer'): + + return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer']) + return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()) + + + + def changeImages(self,caption=None,submit=None,id=None,REQUEST=None): """manage URL""" if submit=="change caption": image=self.ZopeFind(self,obj_ids=[id]) @@ -633,8 +649,14 @@ class versionedFile(Folder): image=self.ZopeFind(self,obj_ids=[id]) if image: self.manage_delObjects([image[0][1].getId()]) - if RESPONSE is not None: - RESPONSE.redirect('../../') + + + if self.REQUEST.SESSION.has_key('refer'): + + return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer']) + return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()) + + def getImages(self): @@ -694,7 +716,8 @@ class versionedFile(Folder): lastVersion=self.getLastVersion() #return "File:"+self.title+" Version:%i"%lastVersion.versionNumber," modified:",lastVersion.bobobase_modification_time()," size:",lastVersion.getSize(),"modified by:",lastVersion.lastEditor() return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.getTime(),lastVersion.getSize(),lastVersion.lastEditor()) - + security= ClassSecurityInfo() + security.declarePublic('getVersion') def getVersion(self): tmp=0 for version in self.ZopeFind(self): @@ -705,7 +728,7 @@ class versionedFile(Folder): tmp=int(version[1].versionNumber,) return tmp+1 - security= ClassSecurityInfo() + security.declareProtected('AUTHENTICATED_USER','unlock') def history(self):