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

Timestamp:

10 Mar 2008, 19:12:40 (17 years ago)

Author:

joachim

Message:

show all fields for editing with value from first record,
show one line per field for better readability
add edit again button for importable files.

File:

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

WAeUP_SRP/base/skins/waeup_upload/uploads_index.py

@@ -29 +29 @@
 
 path_info = request.get('PATH_INFO').split('/')
-NO_KEY = '----'
 info = {}
 info['action'] = "%s" % context.absolute_url()
@@ -47 +46 @@
         msg, invalid_keys = doc['checkKeys']()
         new_keys = []
-        for key in invalid_keys:
-            id_key = "%s|%s" % (short_id,key)
+        for old_key,previous,value in invalid_keys:
+            id_key = "%s|%s" % (short_id,old_key)
             if request.form.has_key(id_key):
                 new_key = request.form.get(id_key)['valid_key']
-                if new_key != NO_KEY:
-                    new_keys += (key,new_key),
+                if new_key != old_key and new_key != doc.NO_KEY:
+                    new_keys += (old_key,new_key),
         if new_keys:
             doc.editHeadline(new_keys)
             for key in new_keys:
                 logger.info('%s changed column heading in file %s from %s to %s' % (member,long_id,key[0],key[1]))
+    return request.RESPONSE.redirect(context.absolute_url())
 
 wrong = []
@@ -66 +66 @@
     doc = upload.getContent()
     row['valid_keys'] = doc['getKeys']()
-    row['valid_keys'][0] = NO_KEY
+    row['valid_keys'][0:0] = doc.NO_KEY,
     row['id'] = id.replace('.csv','')
     row['title'] = doc.filename
@@ -75 +75 @@
     if import_message:
         row['imported'] = True
+        row['imported_by'] = getattr('doc','imported_by','')
         row['msg'] = import_message
         if getattr(doc,'import_date',''):
@@ -83 +84 @@
     else:
         row['msg'],row['invalid_keys'] = doc['checkKeys']()
-        if not row['msg'] and not row['invalid_keys']:
+        if not (request.has_key('goto_edit') and id in ids) and not row['msg']:
             add_to = importable
     row['filename'] = doc.filename
     row['import_layout'] = doc.import_layout
+    row['uploaded_by'] =  doc.uploaded_by
     row['upload_date'] =  doc.upload_date.strftime("%d/%m/%y %H:%M:%S")
-    row['uploaded_by'] = doc.uploaded_by
     row['imported_by'] = doc.imported_by
     add_to.append(row)