Changeset 3320

Timestamp:

11 Mar 2008, 20:31:44 (17 years ago)

Author:

Henrik Bettermann

Message:

make import work

Location:

WAeUP_SRP/base

Files:

• WAeUPImport.py (modified) (2 diffs)
• WAeUPTool.py (modified) (1 diff)
• skins/waeup_upload/import_uploads.py (modified) (3 diffs)

WAeUP_SRP/base/WAeUPImport.py

@@ -60 +60 @@
         self.students_folder = waeup_tool.portal_url.getPortalObject().campus.students
         self.member = member = waeup_tool.portal_membership.getAuthenticatedMember()
-        self.import_date = DateTime.DateTime().strftime("%d/%m/%y %H:%M:%S")
-        self.current = DateTime.DateTime().strftime("%d-%m-%y_%H_%M_%S")
+        self.import_date = DateTime.DateTime()
+        self.imported_by = str(member)
+        #self.current = DateTime.DateTime().strftime("%d-%m-%y_%H_%M_%S")
         self.waeup_tool = waeup_tool
         self.academics_folder = waeup_tool.portal_url.getPortalObject().campus.academics
@@ -102 +103 @@
             info = {}
             info['imported_from'] = ''
-            info['imported_by'] = str(member)
-            info['import_date'] = self.import_date
+            info['imported_by'] =  self.imported_by
+            info['import_date'] = self.import_date.strftime("%d/%m/%y %H:%M:%S")
             info['error'] = ''
             self.info = info

WAeUP_SRP/base/WAeUPTool.py

@@ -1410 +1410 @@
             return importer.init_errors
         member = importer.member
-        current = importer.current
+        #current = importer.current
         import_date = importer.import_date
         imported_by = importer.imported_by

WAeUP_SRP/base/skins/waeup_upload/import_uploads.py

@@ -31 +31 @@
 #pr = context.portal_registration
 
-ids = request.get('ids',[]) 
+ids = request.get('ids',[])
 
 bypass_enabled = False
@@ -38 +38 @@
     short_id = long_id.replace('.csv','')
     doc = getattr(context, long_id).getContent()
-    msg, invalid_keys = doc['checkKeys']()
-    if msg or invalid_keys:
-        continue
+    #msg, invalid_keys = doc['checkKeys']()
+    #if msg or invalid_keys:
+    #    continue
     if not bypass_enabled:
         context.portal_catalog.setBypassQueue(1)
         context.waeup_tool.doCommit()
+        
     msg = context.waeup_tool.importData(short_id,
                                         doc.import_layout,
@@ -56 +57 @@
 args['portal_status_message'] = '\r\n'.join(messages)
 url = context.absolute_url() + '?' + urlencode(args)
-request.RESPONSE.redirect(url)    
-    
+return request.RESPONSE.redirect(url)
 
+