Changeset 5613 for WAeUP_SRP


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/WAeUPImport.py

    r5516 r5613  
    230230            if len(values) != len(import_keys):
    231231                if len(values) == len(import_keys) + len(info_keys):
    232                     msg += "fields from pending file in headline"
     232                    msg += "fields from pending data file in headline"
    233233                else:
    234234                    msg += "%d fields in headline but %d values" % (len(import_keys),len(values))
  • WAeUP_SRP/trunk/skins/waeup_upload/uploads_form.pt

    r4525 r5613  
    6262              </tr>
    6363             
     64              <span tal:condition="python:'fields from pending file in headline' not in row['msg']">
    6465              <tr>
    6566                <td>&nbsp;</td>
     
    9293                <td colspan="3" tal:content="python: key[2]" />
    9394              </tr>
     95              </span>
    9496             
    9597             
     
    106108         
    107109         
    108           <font color='red'>Please see error message for further information. If there are errors in the headline of the import file
     110          <font color='red'>
     111          Please see error message for further information. If there are errors in the headline of the import file
    109112          (e.g. invalid keys in heading), you can edit the uploaded file online. Select the correct field names
    110113          from the select boxes provided, tick the box in the first column of the table and press the Edit button.
    111           If you have accidentally chosen the wrong import data layout, select the correct layout and press the Edit button.  </font>
     114          If you have accidentally chosen the wrong import data layout, select the correct layout and press the Edit button.
     115          If you have re-uploaded a pending data file, then ignore this message. The previous pending data file will be manually
     116          replaced by the portal administrator.</font>
    112117                   
    113118          <br /><br />
Note: See TracChangeset for help on using the changeset viewer.