--- OSA_system2/zpt/addMetadataForm_fragment.zpt	2005/03/07 19:33:42	1.1
+++ OSA_system2/zpt/addMetadataForm_fragment.zpt	2005/11/29 13:21:33	1.4
@@ -6,11 +6,10 @@
 	  Type:
 	</td>
 	<td align="left" valign="top" width="75%">	
-	  <b tal:content="python:foundType[1].title"/>
+	  <b tal:content="python:foundType[1].title or foundType[1].id"/>
 	 </td>
       </tr>
       </table>
-      
 	<input type="hidden" tal:attributes="value here/REQUEST/SESSION/MDF_path" name="MDF_path">
 	<input type="hidden" tal:attributes="value here/REQUEST/SESSION/MDF_type" name="MDF_type">
 		
@@ -25,10 +24,13 @@
 		   </td>
     <td align="left" valign="top" width="75%" tal:define="list python:here.getList(foundType[1].getValue(item)[4])">
       <tal:block tal:condition="not:list">
-	<b><input type="text" name="Author" size="40" value="" tal:attributes="name python:prefix+'MD_'+foundType[1].getValue(item)[0].rstrip(); value python:here.REQUEST.SESSION['MDF_presets'].get(foundType[1].getValue(item)[1].rstrip(),'')"></b>
+	<b><input type="text" size="40" tal:attributes="name python:prefix+'MD_'+foundType[1].getValue(item)[0].rstrip(); value python:here.REQUEST.SESSION['MDF_presets'].get(foundType[1].getValue(item)[0].rstrip(),'')"/></b>
       </tal:block>
-      <select tal:condition="list"  tal:attributes="name python:prefix+'MD_'+foundType[1].getValue(item)[0].rstrip()">
-	<option tal:repeat="element list" tal:attributes="value element" tal:content="element"/>
+      <select tal:condition="list" tal:attributes="name python:prefix+'MD_'+foundType[1].getValue(item)[0].rstrip()" tal:define="value python:here.REQUEST.SESSION['MDF_presets'].get(foundType[1].getValue(item)[0].rstrip(),'')">
+	<tal:block tal:repeat="element list">
+	<option tal:condition="python:element==value" selected="true" tal:attributes="value element" tal:content="element"/>
+	<option tal:condition="not:python:element==value" tal:attributes="value element" tal:content="element"/>
+	</tal:block>
       </select>
    </td>
     <td>