Changeset 3308 for WAeUP_SRP/base


Ignore:
Timestamp:
10 Mar 2008, 07:13:11 (17 years ago)
Author:
Henrik Bettermann
Message:

set correct import_date and imported_by

Location:
WAeUP_SRP/base
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/WAeUPTool.py

    r3300 r3308  
    14121412        current = importer.current
    14131413        import_date = importer.import_date
     1414        imported_by = importer.imported_by
    14141415        #
    14151416        # not_imported
    … …  
    16361637                upload_doc = upload.getContent()
    16371638                mapping = {}
    1638                 mapping['imported_at'] = DateTime.DateTime()
     1639                #mapping['import_date'] = DateTime.DateTime()
     1640                mapping['import_date'] = import_date
     1641                mapping['imported_by'] = imported_by
    16391642                mapping['import_message'] = msg
    16401643                upload_doc.edit(mapping = mapping)

  • WAeUP_SRP/base/skins/waeup_upload/uploads_form.pt

    r3307 r3308  
    163163          <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">     
    164164            <tr>
    165               <th>Filename</th>
     165              <th>File in Archive</th>
    166166              <th>Data Layout</th>
    167               <th>By</th>
    168               <th>Date</th>
     167              <th>Uploaded By</th>
     168              <th>Upload Date</th>
     169              <th>Imported By</th>
    169170              <th>Import Date</th>
    170171              <th>Message</th>
    … …  
    177178              <td tal:content="row/uploaded_by" ></td>
    178179              <td tal:content="row/upload_date" ></td>
    179               <td tal:content="row/imported_at" ></td>
     180              <td tal:content="row/imported_by" ></td>
     181              <td tal:content="row/import_date" ></td>
    180182              <td tal:content="row/msg"></td>
    181183            </tr>

  • WAeUP_SRP/base/skins/waeup_upload/uploads_index.py

    r3307 r3308  
    7676        row['imported'] = True
    7777        row['msg'] = import_message
    78         if getattr(doc,'imported_at',''):
    79             row['imported_at'] = doc.imported_at.strftime("%d/%m/%y %H:%M:%S")
     78        if getattr(doc,'import_date',''):
     79            row['import_date'] = doc.import_date.strftime("%d/%m/%y %H:%M:%S")
    8080        else:
    81             row['imported_at'] = ''
     81            row['import_date'] = ''
    8282        add_to = imported
    8383    else:
    … …  
    9696info['imported'] = imported
    9797info['importable'] = importable
    98 info['import_allowed'] = str(member) in ('admin','joachim',) 
     98info['import_allowed'] = str(member) in ('admin','joachim',)
    9999
    100100validate = "upload" in request.keys()
Note: See TracChangeset for help on using the changeset viewer.