--- versionedFile/extVersionedFile.py 2010/05/11 09:03:08 1.36 +++ versionedFile/extVersionedFile.py 2011/12/05 07:42:38 1.38 @@ -756,7 +756,7 @@ class extVersionedFileObject(ExtFile): """download and lock""" if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': return "please login first" - if not self.aq_parent.lockedBy=="": + if (not ((self.aq_parent.lockedBy=="") or (self.aq_parent.lockedBy==None))): return "cannot be locked because is already locked by %s"%self.lockedBy self.aq_parent.lockedBy=self.REQUEST['AUTHENTICATED_USER'] @@ -769,9 +769,7 @@ class extVersionedFileObject(ExtFile): return self.versionNumber security.declarePublic('getVersionComment') - def getVersionComment(self): - """get version""" - return self.versionComment + security.declarePublic('lastEditor') def lastEditor(self): @@ -1059,11 +1057,15 @@ class extVersionedFile(CatalogAware,Fold """get version with number nr""" tmp=0 lastVersion=None + logging.debug(self.absolute_url()) for version in self.ZopeFind(self): + logging.debug("getVersionNr :"+repr(version)) + logging.debug("nr:"+str(nr)) if hasattr(version[1],'versionNumber'): + logging.debug("vn:"+repr(version[1].versionNumber)) if int(version[1].versionNumber) ==nr : return version[1] - + logging.debug("nothing") return None security.declarePublic('getVersion') @@ -1208,7 +1210,7 @@ class extVersionedFile(CatalogAware,Fold if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]: 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"]) if ext: return ext[0][1]('',globals(),version=self.getVersion(),lastComment=self.getContentObject().getVersionComment(),AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER) @@ -1280,7 +1282,7 @@ class extVersionedFile(CatalogAware,Fold if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User': return "please login first" - if not self.lockedBy=="": + if not ((self.lockedBy=="") or (self.lockedBy==None)): return "cannot be locked because is already locked by %s"%self.lockedBy self.lockedBy=self.REQUEST['AUTHENTICATED_USER'] self.getContentObject().content_type="application/octet-stream"