version 1.61, 2006/06/15 22:01:59
|
version 1.67, 2006/10/03 14:40:26
|
Line 539 class versionedFileObject(File):
|
Line 539 class versionedFileObject(File):
|
manage_editForm._setName('manage_editForm') |
manage_editForm._setName('manage_editForm') |
|
|
|
|
|
|
|
|
security.declarePublic('getTitle') |
security.declarePublic('getTitle') |
|
|
def getTitle(self): |
def getTitle(self): |
Line 665 class versionedFileObject(File):
|
Line 667 class versionedFileObject(File):
|
except:#old version of versionded file sometimes stored the user object and not only the name the following corrects this |
except:#old version of versionded file sometimes stored the user object and not only the name the following corrects this |
ret=str(self.author).replace("-","\n") |
ret=str(self.author).replace("-","\n") |
ret=ret.replace("\r","\n") |
ret=ret.replace("\r","\n") |
return ret |
return ret.lstrip().rstrip() |
|
|
else: |
else: |
jar=self._p_jar |
jar=self._p_jar |
Line 831 class versionedFile(CatalogAware,Folder)
|
Line 833 class versionedFile(CatalogAware,Folder)
|
le=lv.lastEditor() |
le=lv.lastEditor() |
return le |
return le |
|
|
|
def getLockedBy(self): |
|
"""get locked by""" |
|
return str(self.lockedBy) |
|
|
security.declarePublic('getLastVersion') |
security.declarePublic('getLastVersion') |
def getLastVersion(self): |
def getLastVersion(self): |
Line 856 class versionedFile(CatalogAware,Folder)
|
Line 860 class versionedFile(CatalogAware,Folder)
|
def diff(self,data): |
def diff(self,data): |
"""differenz between lastversion and data""" |
"""differenz between lastversion and data""" |
d=Differ() |
d=Differ() |
tmp=self.getLastVersion().data |
data=data.rstrip() |
|
try: |
|
tmp=self.getLastVersion().data.rstrip() |
|
except: |
|
tmp=str(self.getLastVersion().data).rstrip() |
#print "XX",data,tmp |
#print "XX",data,tmp |
|
|
|
try: |
l=list(d.compare(data.splitlines(1),tmp.splitlines(1))) |
l=list(d.compare(data.splitlines(1),tmp.splitlines(1))) |
|
except: |
|
try: |
|
l=list(d.compare(repr(data).splitlines(1),tmp.splitlines(1))) |
|
except: |
|
return 9999,[] |
|
|
plus=0 |
plus=0 |
minus=0 |
minus=0 |
|
|
for a in l: |
for a in l: |
if a[0]=='+': |
if a[0]=='+': |
plus+=1 |
plus+=1 |
Line 913 class versionedFile(CatalogAware,Folder)
|
Line 929 class versionedFile(CatalogAware,Folder)
|
return ret |
return ret |
|
|
security.declareProtected('AUTHENTICATED_USER','forceunlock') |
security.declareProtected('AUTHENTICATED_USER','forceunlock') |
def forceunlock(self,RESPONSE): |
def forceunlock(self,RESPONSE=None): |
"""unlock""" |
"""unlock""" |
|
#safe who had the lock |
|
if self.lockedBy: |
|
self.brokenLock=str(self.lockedBy) |
|
else: |
|
self.brokenLock="" |
self.lockedBy='' |
self.lockedBy='' |
|
return self.brokenLock |
|
|
security.declareProtected('AUTHENTICATED_USER','unlock') |
security.declareProtected('AUTHENTICATED_USER','unlock') |
def unlock(self,RESPONSE): |
def unlock(self,RESPONSE): |