--- versionedFile/versionedFile.py 2006/05/22 10:54:31 1.60 +++ versionedFile/versionedFile.py 2006/06/17 16:32:12 1.63 @@ -539,6 +539,8 @@ class versionedFileObject(File): manage_editForm._setName('manage_editForm') + + security.declarePublic('getTitle') def getTitle(self): @@ -665,7 +667,7 @@ class versionedFileObject(File): 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=ret.replace("\r","\n") - return ret + return ret.lstrip().rstrip() else: jar=self._p_jar @@ -816,6 +818,25 @@ class versionedFile(CatalogAware,Folder) self.comment_date=time.strftime("%Y-%m-%d %H:%M:%S",time.localtime()) return REQUEST.RESPONSE.redirect(self.aq_parent.absolute_url()) + + security.declarePublic('getLastChangeDate') + + def getLastChangeDate(self): + """get last change date""" + lv=self.getLastVersion() + time=lv.getTime() + return time + + def getLastEditor(self): + """get last change date""" + lv=self.getLastVersion() + le=lv.lastEditor() + return le + + def getLockedBy(self): + """get locked by""" + return str(self.lockedBy) + security.declarePublic('getLastVersion') def getLastVersion(self): """Last Version""" @@ -896,9 +917,15 @@ class versionedFile(CatalogAware,Folder) return ret security.declareProtected('AUTHENTICATED_USER','forceunlock') - def forceunlock(self,RESPONSE): + def forceunlock(self,RESPONSE=None): """unlock""" + #safe who had the lock + if self.lockedBy: + self.brokenLock=str(self.lockedBy) + else: + self.brokenLock="" self.lockedBy='' + return self.brokenLock security.declareProtected('AUTHENTICATED_USER','unlock') def unlock(self,RESPONSE): @@ -968,6 +995,10 @@ class versionedFile(CatalogAware,Folder) objs=self.ZopeFind(self,obj_ids=[id])[0][1].setVersionNumber(int(self.getVersion())) self.REQUEST.SESSION['objID_parent']=self.getId() + if getattr(self,'defaultFileCatalog',None): + + self.reindex_object() + if RESPONSE: obj=self.ZopeFind(self,obj_ids=[id])[0][1] if obj.getSize()==0: