Changeset 2350 for WAeUP_SRP/base

Timestamp:

11 Oct 2007, 16:24:46 (17 years ago)

Author:

joachim

Message:

check for correct screening_type, please test

File:

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

WAeUP_SRP/base/Widgets.py

@@ -1338 +1338 @@
         """Prepare datastructure from datamodel."""
         datamodel = datastructure.getDataModel()
+        #import pdb;pdb.set_trace()
         v = datamodel[self.fields[0]]
         widget_id = self.getWidgetId()
@@ -1360 +1361 @@
         datastructure[widget_id+'_b'] = b
         datastructure[widget_id+'_n'] = n
-        screening_type = datamodel.get('screening_type',None)
-        if screening_type is None:
-            screening_type = self.REQUEST.form.get('screening_type','unknown')
+        screening_type = self.REQUEST.traverse_subpath[0]
         datastructure["screening_type"] = screening_type
     ###)
@@ -1373 +1372 @@
         err = 0
         mapping = {}
-        #import pdb;pdb.set_trace()
         prefix= self.prefix
         if prefix.startswith('@'):
@@ -1435 +1433 @@
                 elif datastructure.has_key('record'):
                     applicant = datastructure['record']
+                    if applicant.screening_type != screening_type:
+                        err = "Wrong screening type"
+                        s_logger.info('%ref has screening type %s tried to login for %s' % (ref,
+                                                                                           applicant.screening_type,
+                                                                                           screening_type))
+                        break
                     if not applicant.pin:
                         s_logger.info('%s successfully used PIN %s' % (ref,pin_str))