--- versionedFile/versionedFile.py	2006/05/21 17:40:38	1.58
+++ versionedFile/versionedFile.py	2006/06/15 22:01:59	1.61
@@ -720,6 +720,9 @@ class versionedFile(CatalogAware,Folder)
 
     default_catalog='fileCatalog'
     
+    security= ClassSecurityInfo()   
+    
+    security.declarePublic('getTitle')
     def getTitle(self):
         """get title"""
         return self.title
@@ -784,7 +787,7 @@ class versionedFile(CatalogAware,Folder)
         else:
             return images
                              
-        
+    security.declarePublic('getComment')
     def getComment(self):
         """get the comment of this file"""
         if not hasattr(self,'comment') or (not self.comment) or (self.comment.lstrip()==""):
@@ -813,7 +816,24 @@ 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
+    
     
+        
+    security.declarePublic('getLastVersion')
     def getLastVersion(self):
         """Last Version"""
         tmp=0
@@ -850,13 +870,13 @@ class versionedFile(CatalogAware,Folder)
         
         
         return max([plus,minus]),l
-    
+    security.declarePublic('index_html')
     def index_html(self):
         """main view"""
         lastVersion=self.getLastVersion()
         #return "File:"+self.title+"  Version:%i"%lastVersion.versionNumber," modified:",lastVersion.bobobase_modification_time()," size:",lastVersion.getSize(),"modified by:",lastVersion.lastEditor()
         return "File: %s Version:%i modified:%s size:%s modified by:%s"%(self.title,lastVersion.versionNumber,lastVersion.getTime(),lastVersion.getSize(),lastVersion.lastEditor())
-    security= ClassSecurityInfo()   
+
 
      
     security.declarePublic('getVersion')                                              
@@ -916,9 +936,9 @@ class versionedFile(CatalogAware,Folder)
         if str(self.REQUEST['AUTHENTICATED_USER']) in ["Anonymous User"]:
             return "please login first"
         if (self.lockedBy==self.REQUEST['AUTHENTICATED_USER']) or (self.lockedBy==''):
-            ext=self.ZopeFind(self,obj_ids=["addNewVersion.dtml"])
+            ext=self.ZopeFind(self.aq_parent,obj_ids=["addNewVersion.dtml"])
             if ext:
-                return ext[0][1]('',globals(),version='1',AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER)
+                return ext[0][1]('',globals(),version=self.getVersion(),lastComment=self.getLastVersion().getVersionComment(),AUTHENTICATED_USER=self.REQUEST.AUTHENTICATED_USER)
             else:
                 out=DTMLFile('dtml/fileAdd', globals(),Kind='VersionedFileObject',kind='versionedFileObject',version=self.getVersion()).__of__(self)
                 return out()
@@ -965,6 +985,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: