Changeset 3292 for WAeUP_SRP/base/skins/waeup_upload/uploads_index.py

Timestamp:

9 Mar 2008, 12:47:17 (17 years ago)

Author:

joachim

Message:

implement #500

File:

• WAeUP_SRP/base/skins/waeup_upload/uploads_index.py (modified) (5 diffs)

WAeUP_SRP/base/skins/waeup_upload/uploads_index.py

@@ -1 @@
-## Script (Python) "getUploadsInfo"
+## Script (Python) "uploads_index"
 ##bind container=container
 ##bind context=context
@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=student=None
+##parameters=
 ##title=
 ##
-# $Id:getUploadsInfo.py 486 2006-09-06 10:09:39Z joachim $
+# $Id:uploads_index.py 486 2006-09-06 10:09:39Z joachim $
 """
 return Info about the Uploads
@@ -35 +35 @@
 info['doc'] = context.getContent()
 
-items = []
 edit = request.form.has_key('edit')
 ids = request.get('ids',[])
@@ -59 +58 @@
         request.RESPONSE.redirect(context.absolute_url())
 
+wrong = []
+imported = []
+importable = []
 for id,upload in context.objectItems():
+    add_to = wrong
     row = {}
     doc = upload.getContent()
@@ -67 +70 @@
     row['title'] = doc.filename
     row['url'] = upload.absolute_url()
-    row['msg'], row['invalid_keys'] = doc['checkKeys']()
+    row['imported'] = False
+    row['invalid_keys'] = []
+    import_message = getattr(doc,'import_message','')
+    if import_message:
+        row['imported'] = True
+        row['msg'] = import_message
+        row['imported_at'] = doc.imported_at.strftime("%d/%m/%y %H:%M:%S")
+        add_to = imported
+    else:
+        row['msg'],row['invalid_keys'] = doc['checkKeys']()
+        if not row['msg'] and not row['invalid_keys']:
+            add_to = importable
     row['filename'] = doc.filename
     row['import_layout'] = doc.import_layout
     row['upload_date'] =  doc.upload_date.strftime("%d/%m/%y %H:%M:%S")
     row['uploaded_by'] = doc.uploaded_by
-    items.append(row)
-items.sort()
-info['items'] = items
+    add_to.append(row)
+wrong.sort()
+imported.sort()
+importable.sort()
+info['wrong'] = wrong
+info['imported'] = imported
+info['importable'] = importable
 
 validate = "upload" in request.keys()