version 1.28, 2005/03/03 13:00:39
|
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 411 class versionedFile(Folder):
|
Line 424 class versionedFile(Folder):
|
"""unlock""" |
"""unlock""" |
self.lockedBy='' |
self.lockedBy='' |
|
|
|
security.declareProtected('AUTHENTICATED_USER','unlock') |
|
def unlock(self,RESPONSE): |
|
"""unlock""" |
|
if str(self.lockedBy) in [str(self.REQUEST['AUTHENTICATED_USER'])]: |
|
self.lockedBy='' |
|
RESPONSE.redirect(self.REQUEST['URL2']) |
|
else: |
|
return "Sorry, not locked by you! (%s,%s)"%(self.lockedBy,self.REQUEST['AUTHENTICATED_USER']) |
|
|
|
|
|
|
security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm') |
security.declareProtected('AUTHENTICATED_USER','addVersionedFileObjectForm') |
|
|