--- versionedFile/zpt/versionFileFolderMain.zpt	2005/03/05 11:56:32	1.9
+++ versionedFile/zpt/versionFileFolderMain.zpt	2008/08/08 16:19:26	1.12
@@ -37,13 +37,14 @@
       <tr tal:define="lastVersion python:version[1].getLastVersion()">
 	<td tal:content="python:version[1].title"/>
 	<td>
-	<span tal:replace="lastVersion/versionNumber"/>
+	<span tal:replace="lastVersion/getVersionNumber"/>
 	<font size="-1"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/history'">(history)</a></font>
 	</td>
 	<td tal:content="lastVersion/getTime"/>
 	<td tal:content="lastVersion/lastEditor"/>
-	<td tal:content="lastVersion/versionComment"/>
-        <td><a tal:attributes="href python:version[1].absolute_url()+'/manageCommentForm'"><small tal:content="python:getattr(version[1],'comment','Add')"/></a></td>
+	<td tal:content="lastVersion/getVersionComment"/>
+        <td><a tal:attributes="href python:lastVersion.absolute_url()+'/manageVCommentForm'"><small tal:content="python:lastVersion.getVComment()"/></a></td>
+        <!--<td><a tal:attributes="href python:version[1].absolute_url()+'/manageCommentForm'"><small tal:content="python:version[1].getComment()"/></a></td>-->
 	<td><a tal:attributes="href python:lastVersion.absolute_url()">download</a></td>
 	
 	<td tal:condition="python:lastVersion.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/downloadLocked'">download and lock</a></td>
@@ -51,7 +52,7 @@
 	
 	<td tal:condition="python:lastVersion.lockedBy==''"><a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/addVersionedFileObjectForm'">Upload New Version</a></td>
 	<td tal:condition="not:python:lastVersion.lockedBy==''">
-	  <b tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/addVersionedFileObjectForm'">Locked by: <span tal:replace="lastVersion/lockedBy"/></b>&nbsp;<a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/unlock'">unlock</a>
+	  <b tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/addVersionedFileObjectForm'">Locked by: <span tal:replace="python:repr(lastVersion.getLockedBy())"/></b>&nbsp;<a tal:attributes="href python:here.REQUEST['URL1']+'/'+version[0]+'/unlock'">unlock</a>
 	</td>
       </tr>
     </span>