version 1.50, 2005/11/02 12:38:52
|
version 1.51, 2005/11/21 19:54:11
|
Line 8 from AccessControl import getSecurityMan
|
Line 8 from AccessControl import getSecurityMan
|
from Products.PageTemplates.PageTemplate import PageTemplate |
from Products.PageTemplates.PageTemplate import PageTemplate |
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate |
from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate |
from AccessControl import ClassSecurityInfo |
from AccessControl import ClassSecurityInfo |
<<<<<<< versionedFile.py |
|
from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib |
|
from Products.ZCatalog.CatalogPathAwareness import CatalogAware |
from Products.ZCatalog.CatalogPathAwareness import CatalogAware |
======= |
|
try: |
try: |
from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib |
from Products.ImageArchive.ImageArchive import manage_AddImageZogiLib |
except: |
except: |
print "no images" |
print "no images" |
>>>>>>> 1.49 |
|
|
|
from threading import Thread |
from threading import Thread |
import shutil |
import shutil |
Line 133 class versionedFileFolder(Folder,ECHO_ba
|
Line 133 class versionedFileFolder(Folder,ECHO_ba
|
{'label':'Generate history_template.html','action':'generateHistoryHTML'}, |
{'label':'Generate history_template.html','action':'generateHistoryHTML'}, |
{'label':'Import Folder','action':'importFolderForm'}, |
{'label':'Import Folder','action':'importFolderForm'}, |
{'label':'Export Folder','action':'exportFolder'}, |
{'label':'Export Folder','action':'exportFolder'}, |
|
{'label':'Position of version number','action':'changeHistoryFileNamesForm'}, |
) |
) |
|
|
|
def changeHistoryFileNamesForm(self): |
|
"""change position of version num""" |
|
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','changeHistoryFileNamesForm.zpt')).__of__(self) |
|
return pt() |
|
|
|
|
|
def changeHistoryFileNames(self,positionVersionNum="front",RESPONSE=None): |
|
"""change position of version num""" |
|
|
|
|
|
|
|
versions=self.ZopeFind(self,obj_metatypes=['versionedFileObject'],search_sub=1) |
|
|
|
if not (getattr(self,'positionVersionNum','front')==positionVersionNum): |
|
|
|
for version in versions: |
|
|
|
if positionVersionNum=="front": |
|
|
|
titleTmp=os.path.splitext(version[1].title) |
|
titleTmp2="_".join(titleTmp[0].split("_")[0:-1]) |
|
if len(titleTmp)>1: |
|
id=titleTmp[0].split("_")[-1]+"_"+titleTmp2+"."+titleTmp[1] |
|
else: |
|
id=titleTmp[0].split("_")[-1]+"_"+titleTmp2 |
|
|
|
else: |
|
titleTmp="_".join(version[1].getId().split("_")[1:]) |
|
tmp=os.path.splitext(titleTmp) |
|
if len(tmp)>1: |
|
id=tmp[0]+"_"+version[1].getId().split("_")[0]+tmp[1] |
|
else: |
|
id=tmp[0]+"_"+version[1].getId().split("_")[0] |
|
|
|
print version[0],id |
|
|
|
version[1].aq_parent.manage_renameObjects(ids=[version[1].getId()],new_ids=[id]) |
|
version[1].title=id |
|
|
|
|
|
self.positionVersionNum=positionVersionNum |
|
if RESPONSE: |
|
RESPONSE.redirect("manage_main") |
|
|
|
|
|
|
def importFolderForm(self): |
def importFolderForm(self): |
"""form fuer folder import""" |
"""form fuer folder import""" |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','importFolderForm.zpt')).__of__(self) |
pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','importFolderForm.zpt')).__of__(self) |
Line 469 class versionedFileObject(File):
|
Line 516 class versionedFileObject(File):
|
manage_editForm =DTMLFile('dtml/fileEdit',globals(), |
manage_editForm =DTMLFile('dtml/fileEdit',globals(), |
Kind='File',kind='file') |
Kind='File',kind='file') |
manage_editForm._setName('manage_editForm') |
manage_editForm._setName('manage_editForm') |
<<<<<<< versionedFile.py |
|
|
|
security.declarePublic('getVComment') |
security.declarePublic('getVComment') |
======= |
|
security= ClassSecurityInfo() |
|
|
|
>>>>>>> 1.49 |
|
def getVComment(self): |
def getVComment(self): |
"""get the comment of this file""" |
"""get the comment of this file""" |
if not hasattr(self,'vComment') or (not self.vComment) or (self.vComment.lstrip()==""): |
if not hasattr(self,'vComment') or (not self.vComment) or (self.vComment.lstrip()==""): |
Line 510 class versionedFileObject(File):
|
Line 554 class versionedFileObject(File):
|
return REQUEST.RESPONSE.redirect(self.REQUEST.SESSION['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") |
|
|
<<<<<<< versionedFile.py |
|
security.declarePublic('getVersionComment') |
security.declarePublic('getVersionComment') |
def getVersionComment(self): |
def getVersionComment(self): |
"""getversioncomment""" |
"""getversioncomment""" |
return self.versionComment |
return self.versionComment |
|
|
security.declarePublic('getTime') |
security.declarePublic('getTime') |
======= |
|
security.declarePublic('getTime') |
|
>>>>>>> 1.49 |
|
def getTime(self): |
def getTime(self): |
"""getTime""" |
"""getTime""" |
#return self.bobobase_modification_time().ISO() |
#return self.bobobase_modification_time().ISO() |
Line 572 class versionedFileObject(File):
|
Line 614 class versionedFileObject(File):
|
"""set version""" |
"""set version""" |
self.versionNumber=versionNumber |
self.versionNumber=versionNumber |
|
|
<<<<<<< versionedFile.py |
|
|
|
security.declarePublic('getVersionNumber') |
security.declarePublic('getVersionNumber') |
======= |
|
security.declarePublic('getVersionNumber') |
|
>>>>>>> 1.49 |
|
def getVersionNumber(self): |
def getVersionNumber(self): |
"""get version""" |
"""get version""" |
return self.versionNumber |
return self.versionNumber |
Line 588 class versionedFileObject(File):
|
Line 627 class versionedFileObject(File):
|
return self.versionComment |
return self.versionComment |
|
|
|
|
<<<<<<< versionedFile.py |
|
security.declarePublic('lastEditor') |
|
======= |
|
security.declarePublic('lastEditor') |
security.declarePublic('lastEditor') |
>>>>>>> 1.49 |
|
def lastEditor(self): |
def lastEditor(self): |
"""last Editor""" |
"""last Editor""" |
if hasattr(self,'author'): |
if hasattr(self,'author'): |
Line 848 class versionedFile(CatalogAware,Folder)
|
Line 885 class versionedFile(CatalogAware,Folder)
|
|
|
if not newName=='': |
if not newName=='': |
self.title=newName[0:] |
self.title=newName[0:] |
print self.title |
|
|
|
|
|
|
|
|
|
|
|
|
positionVersionNum=getattr(self,'positionVersionNum','front') |
|
|
|
if positionVersionNum=='front': |
id="V%i"%self.getVersion()+"_"+self.title |
id="V%i"%self.getVersion()+"_"+self.title |
|
else: |
|
tmp=os.path.splitext(self.title) |
|
if len(tmp)>1: |
|
id=tmp[0]+"_V%i"%self.getVersion()+tmp[1] |
|
else: |
|
id=tmp[0]+"_V%i"%self.getVersion() |
|
|
|
|
manage_addVersionedFileObject(self,id,vC,author,file,"V%i"%self.getVersion()+"_"+self.title,precondition, content_type) |
manage_addVersionedFileObject(self,id,vC,author,file,id,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() |
self.REQUEST.SESSION['objID_parent']=self.getId() |
|
|