--- cdli/cdli_files.py 2008/01/04 17:27:39 1.80.2.13 +++ cdli/cdli_files.py 2008/01/07 16:54:46 1.80.2.14 @@ -1512,6 +1512,12 @@ class CDLIFileObject(CatalogAware,extVer security.declareProtected('manage','index_html') + security.declarePublic('view') + view = PageTemplateFile('zpt/viewCDLIFile.zpt', globals()) + + security.declarePublic('editATF') + editATF = PageTemplateFile('zpt/editATFFile.zpt', globals()) + def PrincipiaSearchSource(self): """Return cataloguable key for ourselves.""" return str(self) @@ -1540,11 +1546,6 @@ class CDLIFileObject(CatalogAware,extVer # return re.sub("\s\#lem"," #lem",data) #remove return vor #lem return re.sub("#lem"," #lem",data) #remove return vor #lem - security.declarePublic('view') - def view(self): - """view file""" - pt=PageTemplateFile(os.path.join(package_home(globals()),'zpt','viewCDLIFile.zpt')).__of__(self) - return pt() security.declarePublic('getPNumber') def getPNumber(self): @@ -1573,6 +1574,7 @@ class CDLIFileObject(CatalogAware,extVer return txt.group(2) except: return "ERROR" + manage_addCDLIFileObjectForm=DTMLFile('dtml/fileAdd', globals(),Kind='CDLIFileObject',kind='CDLIFileObject', version='1') @@ -1860,13 +1862,17 @@ class CDLIFileFolder(extVersionedFileFol setattr(self,name,value) + deleteFileForm = PageTemplateFile("zpt/doDeleteFile", globals()) - def delete(self,ids): + def delete(self,ids,REQUEST=None): """delete these files""" if type(ids) is not ListType: ids=[ids] self.manage_delObjects(ids) + + if REQUEST is not None: + return self.index_html() def getVersionNumbersFromIds(self,ids):