Changeset 5613

Timestamp:

14 Dec 2010, 06:48:50 (14 years ago)

Author:

Henrik Bettermann

Message:

Improve message for pending data file.

Location:

WAeUP_SRP/trunk

Files:

• WAeUPImport.py (modified) (1 diff)
• skins/waeup_upload/uploads_form.pt (modified) (3 diffs)

WAeUP_SRP/trunk/WAeUPImport.py

@@ -230 +230 @@
             if len(values) != len(import_keys):
                 if len(values) == len(import_keys) + len(info_keys):
-                    msg += "fields from pending file in headline"
+                    msg += "fields from pending data file in headline"
                 else:
                     msg += "%d fields in headline but %d values" % (len(import_keys),len(values))

WAeUP_SRP/trunk/skins/waeup_upload/uploads_form.pt

@@ -62 +62 @@
               </tr>
               
+              <span tal:condition="python:'fields from pending file in headline' not in row['msg']">
               <tr>
                 <td>&nbsp;</td>
@@ -92 +93 @@
                 <td colspan="3" tal:content="python: key[2]" />
               </tr>
+              </span>
               
               
@@ -106 +108 @@
           
           
-          <font color='red'>Please see error message for further information. If there are errors in the headline of the import file
+          <font color='red'>
+          Please see error message for further information. If there are errors in the headline of the import file
           (e.g. invalid keys in heading), you can edit the uploaded file online. Select the correct field names
           from the select boxes provided, tick the box in the first column of the table and press the Edit button. 
-          If you have accidentally chosen the wrong import data layout, select the correct layout and press the Edit button.  </font>
+          If you have accidentally chosen the wrong import data layout, select the correct layout and press the Edit button. 
+          If you have re-uploaded a pending data file, then ignore this message. The previous pending data file will be manually 
+          replaced by the portal administrator.</font>
                     
           <br /><br />