Changeset 8783 for main/waeup.kofa/trunk/src

Timestamp:

24 Jun 2012, 08:17:57 (12 years ago)

Author:

Henrik Bettermann

Message:

Fix datecenter import step 3. Store header number in first column of preview table instead of original header name. Fix pagetemplate.

We have to improve the browser tests. Setting headerfields is not yet properly tested in datacenter.txt.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/browser

Files:

• pages.py (modified) (2 diffs)
• templates/datacenterimport3page.pt (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -1091 +1091 @@
         if not self.reader:
             return
-        header = self.getPreviewHeader()
+        headers = self.getPreviewHeader()
         num = 0
         data = []
@@ -1100 +1100 @@
             data.append(line)
         result = []
-        for name in header:
+        field_num = 0
+        for name in headers:
             result_line = []
-            result_line.append(name)
+            result_line.append(field_num)
+            field_num += 1
             for d in data:
                 result_line.append(d[name])

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/datacenterimport3page.pt

@@ -42 +42 @@
       <tbody>
         <tr tal:repeat="row prev_table">
-          <td tal:content="python:row[0]"> value
+          <td tal:content="python:headers[row[0]]"> value
           </td>
           <td>
-            <select class="span4" name="python:row[0]">
+            <select class="span4" name="headerfield">
               <option tal:repeat="opt view/getPossibleHeaders"
                 tal:attributes="value opt/value;
-                  selected python: opt['value']==row[0] and 'selected' or '';"
+                  selected python: opt['value']==headers[row[0]] and 'selected' or '';"
                 tal:content="opt/title">
                 new_header_name