version 1.26, 2005/02/24 17:13:27
|
version 1.30, 2005/03/05 11:57:18
|
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): |
|
return cmp(getattr(x[1],'comment','ZZZZZZZZZZZZZ').lower(),getattr(y[1],'comment','ZZZZZZZZZZZZZ').lower()) |
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 110 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 162 class versionedFileFolder(Folder,ECHO_ba
|
Line 166 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 170 class versionedFileFolder(Folder,ECHO_ba
|
Line 176 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 391 class versionedFile(Folder):
|
Line 410 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 401 class versionedFile(Folder):
|
Line 425 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 435 class versionedFile(Folder):
|
Line 460 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() |
|
|