[BACK]Return to extVersionedFile.py CVS log [TXT] [DIR] Up to [Repository] / versionedFile

Diff for /versionedFile/extVersionedFile.py between versions 1.36 and 1.37

version 1.36, 2010/05/11 09:03:08 version 1.37, 2010/05/12 10:58:21
Line 756  class extVersionedFileObject(ExtFile): Line 756  class extVersionedFileObject(ExtFile):
         """download and lock"""          """download and lock"""
         if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':          if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
             return "please login first"              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              return "cannot be locked because is already locked by %s"%self.lockedBy
         self.aq_parent.lockedBy=self.REQUEST['AUTHENTICATED_USER']          self.aq_parent.lockedBy=self.REQUEST['AUTHENTICATED_USER']
   
Line 769  class extVersionedFileObject(ExtFile): Line 769  class extVersionedFileObject(ExtFile):
         return self.versionNumber          return self.versionNumber
   
     security.declarePublic('getVersionComment')                                                    security.declarePublic('getVersionComment')                                              
     def getVersionComment(self):    
         """get version"""  
         return self.versionComment  
   
     security.declarePublic('lastEditor')                                                      security.declarePublic('lastEditor')                                                
     def lastEditor(self):      def lastEditor(self):
Line 1208  class extVersionedFile(CatalogAware,Fold Line 1206  class extVersionedFile(CatalogAware,Fold
                   
         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.getContentObject().getVersionComment(),AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER)                  return ext[0][1]('',globals(),version=self.getVersion(),lastComment=self.getContentObject().getVersionComment(),AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER)
Line 1280  class extVersionedFile(CatalogAware,Fold Line 1278  class extVersionedFile(CatalogAware,Fold
   
         if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':          if repr(self.REQUEST['AUTHENTICATED_USER'])=='Anonymous User':
             return "please login first"              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              return "cannot be locked because is already locked by %s"%self.lockedBy
         self.lockedBy=self.REQUEST['AUTHENTICATED_USER']          self.lockedBy=self.REQUEST['AUTHENTICATED_USER']
         self.getContentObject().content_type="application/octet-stream"          self.getContentObject().content_type="application/octet-stream"
Removed from v.1.36  
changed lines
  Added in v.1.37

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>