--- versionedFile/versionedFile.py 2004/10/25 12:59:11 1.16 +++ versionedFile/versionedFile.py 2005/03/05 12:09:34 1.31 @@ -8,12 +8,21 @@ from Products.PageTemplates.PageTemplate from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate from AccessControl import ClassSecurityInfo import os.path + import time +try: + from Products.ECHO_content.ECHO_collection import ECHO_basis +except: + print "ECHO Elements not imported" + class ECHO_basis: + """leer""" + manage_options=() + def sortv(x,y): return cmp(x[0],y[0]) -class versionedFileFolder(Folder): +class versionedFileFolder(Folder,ECHO_basis): """Folder with versioned files""" @@ -21,25 +30,30 @@ class versionedFileFolder(Folder): security= ClassSecurityInfo() security.declareProtected('AUTHENTICATED_USER','addFileForm') - - manage_options = Folder.manage_options+( + + if ECHO_basis: + optTMP= Folder.manage_options+ECHO_basis.manage_options + else: + optTMP= Folder.manage_options + + manage_options =optTMP+( {'label':'Generate Index.html','action':'generateIndexHTML'}, {'label':'Generate history_template.html','action':'generateHistoryHTML'}, - ) + ) + + def helpDownload(self): """download help""" - pt=PageTemplateFile('Products/versionedFile/zpt/helpDownload').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','helpDownload')).__of__(self) return pt() def generateIndexHTML(self,RESPONSE=None): """lege standard index.html an""" - - - if not hasattr(self,'index.html'): + if not self.ZopeFind(self,obj_ids=['index.html']): zt=ZopePageTemplate('index.html') self._setObject('index.html',zt) default_content_fn = os.path.join(package_home(globals()), @@ -59,8 +73,7 @@ class versionedFileFolder(Folder): - - if not hasattr(self,'history_template.html'): + if not self.ZopeFind(self,obj_ids=['history_template.html']): zt=ZopePageTemplate('history_template.html') self._setObject('history_template.html',zt) default_content_fn = os.path.join(package_home(globals()), @@ -78,14 +91,25 @@ class versionedFileFolder(Folder): """get all versioned files""" def sortName(x,y): - return cmp(x[1].title,y[1].title) + return cmp(x[1].title.lower(),y[1].title.lower()) def sortDate(x,y): - return cmp(x[1].getLastVersion().getTime(),y[1].getLastVersion().getTime) + return cmp(y[1].getLastVersion().getTime(),x[1].getLastVersion().getTime()) + + def sortComment(x,y): + try: + x=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower() + except: + x='zzzzzzzzzzzzzzzz' + try: + y=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower() + except: + y='zzzzzzzzzzzzzzzz' + return cmp(x,y) def sortAuthor(x,y): - return cmp(x[1].getLastVersion().lastEditor(),y[1].getLastVersion().lastEditor()) + return cmp(x[1].getLastVersion().lastEditor().lower(),y[1].getLastVersion().lastEditor().lower()) versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile']) @@ -95,6 +119,8 @@ class versionedFileFolder(Folder): versionedFiles.sort(sortDate) elif sortField=='author': versionedFiles.sort(sortAuthor) + elif sortField=='comment': + versionedFiles.sort(sortComment) return versionedFiles @@ -113,12 +139,16 @@ class versionedFileFolder(Folder): if ext: return ext[0][1]() - pt=PageTemplateFile('Products/versionedFile/zpt/versionFileFolderMain').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionFileFolderMain')).__of__(self) return pt() def addFileForm(self): """add a file""" + ext=self.ZopeFind(self,obj_ids=["addFileForm.dtml"]) + if ext: + return ext[0][1]('',globals(),version='1',AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER) + out=DTMLFile('dtml/newFileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version='1').__of__(self) return out() @@ -126,19 +156,47 @@ class versionedFileFolder(Folder): def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None): """ add a new file""" if newName=='': - id=file.filename + filename=file.filename + id=filename[max(filename.rfind('/'), + filename.rfind('\\'), + filename.rfind(':'), + )+1:] + else: id=newName vC=self.REQUEST.form['vC'] manage_addVersionedFile(self,id,'','') + #if (getattr(self,'commentNonEmpty',0)==1) and vC.strip()=="": + + ob=self._getOb(id) ob.title=id file2=file - ob.manage_addVersionedFileObject(id,vC,author,file2,content_type=content_type) - + + 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) + return pt() + 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()) @@ -291,7 +349,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 @@ -332,7 +407,7 @@ class versionedFile(Folder): if ext: return getattr(self,ext[0][1].getId())() - pt=PageTemplateFile('Products/versionedFile/zpt/versionHistory').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','versionHistory')).__of__(self) return pt() def getVersions(self): @@ -344,6 +419,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""" @@ -353,6 +433,7 @@ class versionedFile(Folder): else: return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) + security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm') @@ -374,18 +455,35 @@ class versionedFile(Folder): author=self.REQUEST['author'] if changeName=="yes": - self.title=file.filename[0:] + filename=file.filename + self.title=filename[max(filename.rfind('/'), + filename.rfind('\\'), + filename.rfind(':'), + )+1:] + if not newName=='': self.title=newName[0:] id="V%i"%self.getVersion()+"_"+self.title + 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: - RESPONSE.redirect(self.REQUEST['URL2']) + 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() + + else: + RESPONSE.redirect(self.REQUEST['URL2']) + else: + return self.ZopeFind(self,obj_ids=[id])[0][1] + security.declareProtected('AUTHENTICATED_USER','downloadLocked') def download(self): @@ -405,7 +503,7 @@ class versionedFile(Folder): def manage_addVersionedFileForm(self): """interface for adding the OSAS_root""" - pt=PageTemplateFile('Products/versionedFile/zpt/addVersionedFile.zpt').__of__(self) + pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addVersionedFile.zpt')).__of__(self) return pt() def manage_addVersionedFile(self,id,title,lockedBy, author=None, RESPONSE=None):