Changeset 6837 for main/waeup.sirp/trunk/src/waeup

Timestamp:

30 Sep 2011, 10:27:23 (13 years ago)

Author:

Henrik Bettermann

Message:

Ensure that only update mode can be used for StudentStudyCourse? imports. Import mode is automatically set to 'update' if the processor's util_name contains 'update'. We can use the same technique for other processors and modes (to be implemented).

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/batchprocessing.txt (modified) (1 diff)
• browser/pages.py (modified) (1 diff)
• students/batching.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/batchprocessing.txt

@@ -95 +95 @@
     ['Applicants Container Importer',
      'Student Importer',
-     'StudentStudyCourse Importer',
+     'StudentStudyCourse Importer (update only)',
      'CertificateCourse Importer',
      'Certificate Importer',

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -612 +612 @@
             self.mode_locked = True
         self.importer = importer or session.get('import_importer', None)
+        session['import_importer'] = self.importer
+        if self.importer and 'update' in self.importer:
+            if self.mode != 'update':
+                self.flash('Update mode only!')
+                self.mode_locked = True
+                self.mode = 'update'
+                proceed = None
         session['import_mode'] = self.mode
-        session['import_importer'] = self.importer
         if proceed is not None:
             self.redirect(self.url(self.context, '@@import3'))

main/waeup.sirp/trunk/src/waeup/sirp/students/batching.py

@@ -31 +31 @@
     location_fields = ['student_id',]
     factory_name = 'waeup.Student'
-
-    mode = None
 
     @property
@@ -77 +75 @@
     grok.provides(IBatchProcessor)
     grok.context(Interface)
-    util_name = 'studycourseimporter'
+    util_name = 'studycourseupdater'
     grok.name(util_name)
 
-    name = u'StudentStudyCourse Importer'
+    name = u'StudentStudyCourse Importer (update only)'
     iface = IStudentStudyCourseImport
     factory_name = 'waeup.StudentStudyCourse'
@@ -90 +88 @@
             ['student_id','reg_number'] + getFields(self.iface).keys())))
 
-    def checkHeaders(self, headerfields, mode='update'):
+    def checkHeaders(self, headerfields, mode='ignore'):
         if not 'reg_number' in headerfields and not 'student_id' in headerfields:
             raise FatalCSVError(