Changeset 2353

Timestamp:

12 Oct 2007, 10:47:41 (17 years ago)

Author:

Henrik Bettermann

Message:

ensure that always correct application form is used

File:

• WAeUP_SRP/base/Widgets.py (modified) (5 diffs)

WAeUP_SRP/base/Widgets.py

@@ -1361 +1361 @@
         datastructure[widget_id+'_b'] = b
         datastructure[widget_id+'_n'] = n
-        if self.REQUEST.traverse_subpath:
-            screening_type = self.REQUEST.traverse_subpath[0]
-        else:
-            screening_type = 'manage'
-        datastructure["screening_type"] = screening_type
-        #import pdb;pdb.set_trace()
     ###)
 
     def validate(self, datastructure, **kw): ###(
         """Validate datastructure and update datamodel."""
+        #import pdb;pdb.set_trace()
         s_logger = logging.getLogger('Widgets.ScratchcardPinWidget.validate')
         widget_id = self.getWidgetId()
@@ -1430 +1425 @@
             if ok >= 1:
                 #screening_type = self.REQUEST.form.get('screening_type','unknown')
-                screening_type = datastructure['screening_type']
+                #screening_type = datastructure['screening_type']                
+                
+                if self.REQUEST.traverse_subpath:
+                    screening_type_request = self.REQUEST.traverse_subpath[0]
+                else:
+                    screening_type_request = 'manage'
                 if self.isStudent():
                     err = "You are a student!"
@@ -1438 +1438 @@
                     applicant = datastructure['record']
                     
-                    if applicant.screening_type != screening_type and screening_type != 'manage':
-                        err = "Wrong application form!"
+                    if applicant.screening_type != screening_type_request and screening_type_request != 'manage':
+                        err = "You used the wrong application form!"
                         s_logger.info('%s tried to use %s application form but has applied for %s' % (ref,
-                                                                                           screening_type,
+                                                                                           screening_type_request,
                                                                                            applicant.screening_type))
                         break
@@ -1449 +1449 @@
                         d['reg_no'] = applicant.reg_no
                         d['pin'] = pin_str
-                        d['screening_type'] = screening_type
+                        #d['screening_type'] = screening_type
                         d['status'] = 'entered'
                         getattr(self,self.catalog).modifyRecord(**d)
@@ -1465 +1465 @@
                         d['pin'] = pin_str
                         d['status'] = 'entered'
-                        d['screening_type'] = screening_type
+                        d['screening_type'] = screening_type_request
                         self.applicants_catalog.addRecord(**d)
                     else: