version 1.32, 2005/03/21 08:12:46
|
version 1.34, 2005/03/31 16:44:23
|
Line 101 class versionedFileFolder(Folder,ECHO_ba
|
Line 101 class versionedFileFolder(Folder,ECHO_ba
|
|
|
|
|
def sortComment(x,y): |
def sortComment(x,y): |
|
|
|
|
|
|
|
try: |
|
xc=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower() |
|
except: |
|
xc='ZZZZZZZZZZZZZ'.lower() |
|
try: |
|
yc=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower() |
|
except: |
|
yc='ZZZZZZZZZZZZZ'.lower() |
|
|
|
|
|
if (xc=='') or (xc=='ZZZZZZZZZZZZZ'.lower()): |
|
|
try: |
try: |
x=getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower() |
xc=x[1].getLastVersion().getVComment().lower() |
except: |
except: |
x='zzzzzzzzzzzzzzzz' |
xc='ZZZZZZZZZZZZZ'.lower() |
|
|
|
if (yc=='') or (yc=='ZZZZZZZZZZZZZ'.lower()): |
try: |
try: |
y=getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower() |
yc=y[1].getLastVersion().getVComment().lower() |
except: |
except: |
y='zzzzzzzzzzzzzzzz' |
yc='ZZZZZZZZZZZZZ'.lower() |
return cmp(x,y) |
|
|
|
|
return cmp(xc,yc) |
|
|
def sortAuthor(x,y): |
def sortAuthor(x,y): |
|
|
Line 255 class versionedFileObject(File):
|
Line 274 class versionedFileObject(File):
|
|
|
def manageVCommentForm(self): |
def manageVCommentForm(self): |
"""add a comment""" |
"""add a comment""" |
|
|
|
self.REQUEST.SESSION['refer']=self.REQUEST['HTTP_REFERER'] |
|
|
|
|
|
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addVComment')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','addVComment')).__of__(self) |
return pt() |
return pt() |
|
|
Line 269 class versionedFileObject(File):
|
Line 293 class versionedFileObject(File):
|
|
|
self.vComment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime()) |
self.vComment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime()) |
|
|
|
if self.REQUEST.SESSION.has_key('refer'): |
|
|
|
return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['refer']) |
return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history") |
return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()+"/history") |
|
|
|
|
Line 290 class versionedFileObject(File):
|
Line 317 class versionedFileObject(File):
|
def download(self): |
def download(self): |
"""download and lock""" |
"""download and lock""" |
|
|
|
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getId()) |
|
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") |
|
|
self.content_type="application/octet-stream" |
self.content_type="application/octet-stream" |
self.REQUEST.RESPONSE.redirect(self.absolute_url()) |
#self.REQUEST.RESPONSE.redirect(self.absolute_url()) |
|
self.REQUEST.RESPONSE.write(self.index_html()) |
|
#self.REQUEST.RESPONSE.write("bl") |
|
self.REQUEST.close() |
|
|
def downloadLocked(self): |
def downloadLocked(self): |
"""download and lock""" |
"""download and lock""" |
Line 532 class versionedFile(Folder):
|
Line 564 class versionedFile(Folder):
|
|
|
def download(self): |
def download(self): |
"""download and lock""" |
"""download and lock""" |
self.getLastVersion().content_type="application/octet-stream" |
|
self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId()) |
self.REQUEST.RESPONSE.setHeader("Content-Disposition","""attachement; filename=%s"""%self.getLastVersion().getId()) |
|
self.REQUEST.RESPONSE.setHeader("Content-Type","application/octet-stream") |
|
|
|
self.content_type="application/octet-stream" |
|
#self.REQUEST.RESPONSE.write("bl") |
|
self.REQUEST.RESPONSE.write(self.getLastVersion().index_html()) |
|
self.REQUEST.close() |
|
|
|
#self.getLastVersion().content_type="application/octet-stream" |
|
#self.REQUEST.RESPONSE.redirect(self.REQUEST['URL1']+'/'+self.getId()+'/'+self.getLastVersion().getId()) |
|
|
def downloadLocked(self): |
def downloadLocked(self): |
"""download and lock""" |
"""download and lock""" |