version 1.71, 2007/09/10 19:27:55
|
version 1.74, 2010/05/12 10:58:21
|
Line 433 class versionedFileFolder(Folder,ECHO_ba
|
Line 433 class versionedFileFolder(Folder,ECHO_ba
|
|
|
|
|
def header_html(self): |
def header_html(self): |
"""zusätzlicher header""" |
"""zusaetzlicher header""" |
ext=self.ZopeFind(self,obj_ids=["header.html"]) |
ext=self.ZopeFind(self,obj_ids=["header.html"]) |
if ext: |
if ext: |
return ext[0][1]() |
return ext[0][1]() |
Line 867 class versionedFile(CatalogAware,Folder)
|
Line 867 class versionedFile(CatalogAware,Folder)
|
lastVersion.versionNumber=1 |
lastVersion.versionNumber=1 |
return lastVersion |
return lastVersion |
|
|
|
def getVersionNr(self,nr): |
|
"""Last Version""" |
|
tmp=0 |
|
lastVersion=None |
|
|
|
|
|
for version in self.ZopeFind(self): |
|
|
|
if hasattr(version[1],'versionNumber'): |
|
|
|
if int(version[1].versionNumber) ==nr : |
|
return version[1] |
|
|
|
return None |
def diff(self,data): |
def diff(self,data): |
"""differenz between lastversion and data""" |
"""differenz between lastversion and data""" |
d=Differ() |
d=Differ() |
Line 968 class versionedFile(CatalogAware,Folder)
|
Line 981 class versionedFile(CatalogAware,Folder)
|
|
|
if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]: |
if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]: |
return "please login first" |
return "please login first" |
if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy==''): |
if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy=='') or (self.lockedBy==None): |
ext=self.ZopeFind(self.aq_parent,obj_ids=["addNewVersion.dtml"]) |
ext=self.ZopeFind(self.aq_parent,obj_ids=["addNewVersion.dtml"]) |
if ext: |
if ext: |
return ext[0][1]('',globals(),version=self.getVersion(),lastComment=self.getLastVersion().getVersionComment(),AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER) |
return ext[0][1]('',globals(),version=self.getVersion(),lastComment=self.getLastVersion().getVersionComment(),AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER) |