Changeset 3308 for WAeUP_SRP/base/skins/waeup_upload

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/skins/waeup_upload

Files:

• uploads_form.pt (modified) (2 diffs)
• uploads_index.py (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_upload/uploads_form.pt

@@ -163 +163 @@
           <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">      
             <tr>
-              <th>Filename</th>
+              <th>File in Archive</th>
               <th>Data Layout</th>
-              <th>By</th>
-              <th>Date</th>
+              <th>Uploaded By</th>
+              <th>Upload Date</th>
+              <th>Imported By</th>
               <th>Import Date</th>
               <th>Message</th>
@@ -177 +178 @@
               <td tal:content="row/uploaded_by" ></td>
               <td tal:content="row/upload_date" ></td>
-              <td tal:content="row/imported_at" ></td>
+              <td tal:content="row/imported_by" ></td>
+              <td tal:content="row/import_date" ></td>
               <td tal:content="row/msg"></td>
             </tr>

WAeUP_SRP/base/skins/waeup_upload/uploads_index.py

@@ -76 +76 @@
         row['imported'] = True
         row['msg'] = import_message
-        if getattr(doc,'imported_at',''):
-            row['imported_at'] = doc.imported_at.strftime("%d/%m/%y %H:%M:%S")
+        if getattr(doc,'import_date',''):
+            row['import_date'] = doc.import_date.strftime("%d/%m/%y %H:%M:%S")
         else:
-            row['imported_at'] = ''
+            row['import_date'] = ''
         add_to = imported
     else:
@@ -96 +96 @@
 info['imported'] = imported
 info['importable'] = importable
-info['import_allowed'] = str(member) in ('admin','joachim',) 
+info['import_allowed'] = str(member) in ('admin','joachim',)
 
 validate = "upload" in request.keys()