Changeset 3316 for WAeUP_SRP/base/skins/waeup_upload/uploads_form.pt

Timestamp:

11 Mar 2008, 14:16:31 (17 years ago)

Author:

joachim

Message:

allow ignore,
check for duplicates

File:

• WAeUP_SRP/base/skins/waeup_upload/uploads_form.pt (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_upload/uploads_form.pt

@@ -66 +66 @@
                 <th>Value from 1. record</th>
               </tr>
-              <tr tal:repeat="key row/invalid_keys">
+              <tr tal:repeat="key row/fields">
                 <td colspan="1"> 
-                  <font tal:attributes="color python: test(key[1] == '----' and not key[0].startswith('ignore'),'red','black')" tal:content="python: key[0]" />
+                  <font tal:attributes="color python: test(key[3],'red','black')">
+                    <span tal:content="python: key[1]" tal:omit-tag=""/> 
+                    <span tal:condition="python: key[3]" tal:content="python: key[3]" tal:omit-tag=""/> 
+                  </font>
                 </td>
                 <td colspan="1" 
                     tal:define="old_key python: key[0];new_key python: key[1];">
-                  <select tal:attributes="name string:${row/id}|${old_key}.valid_key:record">
+                  <select tal:attributes="name string:${row/id}|${repeat/key/index}.valid_key:record">
                     <option tal:repeat="new row/valid_keys"
-                            tal:attributes="value new; selected python: new == new_key"
+                            tal:attributes="value new; selected python: new_key == new"
                             tal:content="new" />
                   </select><br />