version 1.23, 2005/01/06 16:04:46
|
version 1.31, 2005/03/05 12:09:34
|
Line 96 class versionedFileFolder(Folder,ECHO_ba
|
Line 96 class versionedFileFolder(Folder,ECHO_ba
|
def sortDate(x,y): |
def sortDate(x,y): |
return cmp(y[1].getLastVersion().getTime(),x[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): |
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']) |
versionedFiles=self.ZopeFind(self,obj_metatypes=['versionedFile']) |
|
|
Line 108 class versionedFileFolder(Folder,ECHO_ba
|
Line 119 class versionedFileFolder(Folder,ECHO_ba
|
versionedFiles.sort(sortDate) |
versionedFiles.sort(sortDate) |
elif sortField=='author': |
elif sortField=='author': |
versionedFiles.sort(sortAuthor) |
versionedFiles.sort(sortAuthor) |
|
elif sortField=='comment': |
|
versionedFiles.sort(sortComment) |
|
|
return versionedFiles |
return versionedFiles |
|
|
Line 143 class versionedFileFolder(Folder,ECHO_ba
|
Line 156 class versionedFileFolder(Folder,ECHO_ba
|
def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None): |
def addFile(self,vC,file,author,newName='',content_type='',RESPONSE=None): |
""" add a new file""" |
""" add a new file""" |
if newName=='': |
if newName=='': |
id=file.filename |
filename=file.filename |
|
id=filename[max(filename.rfind('/'), |
|
filename.rfind('\\'), |
|
filename.rfind(':'), |
|
)+1:] |
|
|
else: |
else: |
id=newName |
id=newName |
|
|
Line 157 class versionedFileFolder(Folder,ECHO_ba
|
Line 175 class versionedFileFolder(Folder,ECHO_ba
|
file2=file |
file2=file |
|
|
obj=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: |
if obj.getSize()==0: |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
Line 165 class versionedFileFolder(Folder,ECHO_ba
|
Line 185 class versionedFileFolder(Folder,ECHO_ba
|
RESPONSE.redirect(self.REQUEST['URL1']) |
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()) |
manage_addVersionedFileFolderForm=DTMLFile('dtml/folderAdd', globals()) |
|
|
|
|
Line 316 class versionedFile(Folder):
|
Line 349 class versionedFile(Folder):
|
|
|
meta_type="versionedFile" |
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): |
def getLastVersion(self): |
"""Last Version""" |
"""Last Version""" |
Line 369 class versionedFile(Folder):
|
Line 419 class versionedFile(Folder):
|
ret.sort(sortv) |
ret.sort(sortv) |
return ret |
return ret |
|
|
|
security.declareProtected('AUTHENTICATED_USER','forceunlock') |
|
def forceunlock(self,RESPONSE): |
|
"""unlock""" |
|
self.lockedBy='' |
|
|
security.declareProtected('AUTHENTICATED_USER','unlock') |
security.declareProtected('AUTHENTICATED_USER','unlock') |
def unlock(self,RESPONSE): |
def unlock(self,RESPONSE): |
"""unlock""" |
"""unlock""" |
Line 379 class versionedFile(Folder):
|
Line 434 class versionedFile(Folder):
|
return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) |
return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) |
|
|
|
|
|
|
security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm') |
security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm') |
|
|
def addVersionedFileObjectForm(self): |
def addVersionedFileObjectForm(self): |
Line 399 class versionedFile(Folder):
|
Line 455 class versionedFile(Folder):
|
author=self.REQUEST['author'] |
author=self.REQUEST['author'] |
|
|
if changeName=="yes": |
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=='': |
if not newName=='': |
self.title=newName[0:] |
self.title=newName[0:] |
Line 408 class versionedFile(Folder):
|
Line 469 class versionedFile(Folder):
|
|
|
manage_addVersionedFileObject(self,id,vC,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type) |
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())) |
objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) |
|
self.REQUEST.SESSION['objID_parent']=self.getId() |
|
|
if RESPONSE: |
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) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','errorUploadFile')).__of__(self) |
return pt() |
return pt() |
|
|