version 1.14, 2004/07/27 07:56:21
|
version 1.31, 2005/03/05 12:09:34
|
Line 9 from Products.PageTemplates.ZopePageTemp
|
Line 9 from Products.PageTemplates.ZopePageTemp
|
from AccessControl import ClassSecurityInfo |
from AccessControl import ClassSecurityInfo |
import os.path |
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): |
def sortv(x,y): |
return cmp(x[0],y[0]) |
return cmp(x[0],y[0]) |
|
|
class versionedFileFolder(Folder): |
class versionedFileFolder(Folder,ECHO_basis): |
"""Folder with versioned files""" |
"""Folder with versioned files""" |
|
|
|
|
Line 22 class versionedFileFolder(Folder):
|
Line 31 class versionedFileFolder(Folder):
|
security= ClassSecurityInfo() |
security= ClassSecurityInfo() |
security.declareProtected('AUTHENTICATED_USER','addFileForm') |
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 Index.html','action':'generateIndexHTML'}, |
{'label':'Generate history_template.html','action':'generateHistoryHTML'}, |
{'label':'Generate history_template.html','action':'generateHistoryHTML'}, |
) |
) |
|
|
|
|
|
|
def helpDownload(self): |
def helpDownload(self): |
"""download help""" |
"""download help""" |
|
|
pt=PageTemplateFile('Products/versionedFile/zpt/helpDownload').__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','helpDownload')).__of__(self) |
return pt() |
return pt() |
|
|
def generateIndexHTML(self,RESPONSE=None): |
def generateIndexHTML(self,RESPONSE=None): |
"""lege standard index.html an""" |
"""lege standard index.html an""" |
|
|
|
|
|
if not self.ZopeFind(self,obj_ids=['index.html']): |
|
|
if not hasattr(self,'index.html'): |
|
zt=ZopePageTemplate('index.html') |
zt=ZopePageTemplate('index.html') |
self._setObject('index.html',zt) |
self._setObject('index.html',zt) |
default_content_fn = os.path.join(package_home(globals()), |
default_content_fn = os.path.join(package_home(globals()), |
Line 59 class versionedFileFolder(Folder):
|
Line 73 class versionedFileFolder(Folder):
|
|
|
|
|
|
|
|
if not self.ZopeFind(self,obj_ids=['history_template.html']): |
if not hasattr(self,'history_template.html'): |
|
zt=ZopePageTemplate('history_template.html') |
zt=ZopePageTemplate('history_template.html') |
self._setObject('history_template.html',zt) |
self._setObject('history_template.html',zt) |
default_content_fn = os.path.join(package_home(globals()), |
default_content_fn = os.path.join(package_home(globals()), |
Line 78 class versionedFileFolder(Folder):
|
Line 91 class versionedFileFolder(Folder):
|
"""get all versioned files""" |
"""get all versioned files""" |
|
|
def sortName(x,y): |
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): |
def sortDate(x,y): |
return cmp(x[1].getLastVersion().bobobase_modification_time,y[1].getLastVersion().bobobase_modification_time) |
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 95 class versionedFileFolder(Folder):
|
Line 119 class versionedFileFolder(Folder):
|
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 113 class versionedFileFolder(Folder):
|
Line 139 class versionedFileFolder(Folder):
|
if ext: |
if ext: |
return ext[0][1]() |
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() |
return pt() |
|
|
|
|
def addFileForm(self): |
def addFileForm(self): |
"""add a file""" |
"""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) |
out=DTMLFile('dtml/newFileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version='1').__of__(self) |
return out() |
return out() |
|
|
Line 126 class versionedFileFolder(Folder):
|
Line 156 class versionedFileFolder(Folder):
|
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 |
|
|
vC=self.REQUEST.form['vC'] |
vC=self.REQUEST.form['vC'] |
manage_addVersionedFile(self,id,'','') |
manage_addVersionedFile(self,id,'','') |
|
#if (getattr(self,'commentNonEmpty',0)==1) and vC.strip()=="": |
|
|
|
|
ob=self._getOb(id) |
ob=self._getOb(id) |
ob.title=id |
ob.title=id |
file2=file |
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']) |
RESPONSE.redirect(self.REQUEST['URL1']) |
|
|
Line 183 class versionedFileObject(File):
|
Line 241 class versionedFileObject(File):
|
Kind='File',kind='file') |
Kind='File',kind='file') |
manage_editForm._setName('manage_editForm') |
manage_editForm._setName('manage_editForm') |
|
|
|
def getTime(self): |
|
"""getTime""" |
|
#return self.bobobase_modification_time().ISO() |
|
if hasattr(self,'time'): |
|
return time.strftime("%Y-%m-%d %H:%M:%S",self.time) |
|
elif hasattr(self,'timefixed'): |
|
return self.timefixed |
|
else: |
|
setattr(self,'timefixed',self.bobobase_modification_time().ISO()) |
|
return self.bobobase_modification_time().ISO() |
|
|
|
|
|
|
|
|
|
|
def download(self): |
def download(self): |
Line 248 def manage_addVersionedFileObject(self,i
|
Line 319 def manage_addVersionedFileObject(self,i
|
# First, we create the file without data: |
# First, we create the file without data: |
self._setObject(id, versionedFileObject(id,title,'',content_type, precondition)) |
self._setObject(id, versionedFileObject(id,title,'',content_type, precondition)) |
self._getOb(id).versionComment=str(vC) |
self._getOb(id).versionComment=str(vC) |
|
self._getOb(id).time=time.localtime() |
|
|
setattr(self._getOb(id),'author',author) |
setattr(self._getOb(id),'author',author) |
|
|
# Now we "upload" the data. By doing this in two steps, we |
# Now we "upload" the data. By doing this in two steps, we |
Line 273 class versionedFile(Folder):
|
Line 346 class versionedFile(Folder):
|
self.lockedBy=lockedBy |
self.lockedBy=lockedBy |
self.author=author |
self.author=author |
|
|
|
|
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""" |
tmp=0 |
tmp=0 |
Line 293 class versionedFile(Folder):
|
Line 385 class versionedFile(Folder):
|
"""main view""" |
"""main view""" |
lastVersion=self.getLastVersion() |
lastVersion=self.getLastVersion() |
#return "File:"+self.title+" Version:%i"%lastVersion.versionNumber," modified:",lastVersion.bobobase_modification_time()," size:",lastVersion.getSize(),"modified by:",lastVersion.lastEditor() |
#return "File:"+self.title+" Version:%i"%lastVersion.versionNumber," modified:",lastVersion.bobobase_modification_time()," size:",lastVersion.getSize(),"modified by:",lastVersion.lastEditor() |
return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.bobobase_modification_time(),lastVersion.getSize(),lastVersion.lastEditor()) |
return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.getTime(),lastVersion.getSize(),lastVersion.lastEditor()) |
|
|
def getVersion(self): |
def getVersion(self): |
tmp=0 |
tmp=0 |
Line 315 class versionedFile(Folder):
|
Line 407 class versionedFile(Folder):
|
if ext: |
if ext: |
return getattr(self,ext[0][1].getId())() |
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() |
return pt() |
|
|
def getVersions(self): |
def getVersions(self): |
Line 327 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 337 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 357 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:] |
|
|
id="V%i"%self.getVersion()+"_"+self.title |
id="V%i"%self.getVersion()+"_"+self.title |
|
|
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: |
|
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']) |
RESPONSE.redirect(self.REQUEST['URL2']) |
|
|
|
else: |
|
return self.ZopeFind(self,obj_ids=[id])[0][1] |
|
|
security.declareProtected('AUTHENTICATED_USER','downloadLocked') |
security.declareProtected('AUTHENTICATED_USER','downloadLocked') |
|
|
def download(self): |
def download(self): |
Line 388 class versionedFile(Folder):
|
Line 503 class versionedFile(Folder):
|
|
|
def manage_addVersionedFileForm(self): |
def manage_addVersionedFileForm(self): |
"""interface for adding the OSAS_root""" |
"""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() |
return pt() |
|
|
def manage_addVersionedFile(self,id,title,lockedBy, author=None, RESPONSE=None): |
def manage_addVersionedFile(self,id,title,lockedBy, author=None, RESPONSE=None): |