Changeset 2352 for WAeUP_SRP/base

Timestamp:

12 Oct 2007, 07:07:08 (17 years ago)

Author:

Henrik Bettermann

Message:

for Joachim

File:

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

WAeUP_SRP/base/Widgets.py

@@ -1361 +1361 @@
         datastructure[widget_id+'_b'] = b
         datastructure[widget_id+'_n'] = n
-        screening_type = self.REQUEST.traverse_subpath[0]
+        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()
     ###)
 
@@ -1413 +1417 @@
                 break
             elif ok == -2:
-                err = 'Service already is activated but with a different PIN.'
+                err = 'Service is already activated but with a different PIN.'
                 s_logger.info('%s/%s repeatedly activated service but with different PIN %s' % (member_id,ref,pin_str))
                 break
@@ -1428 +1432 @@
                 screening_type = datastructure['screening_type']
                 if self.isStudent():
-                    err = "This is only for Pume application."
+                    err = "You are a student!"
                     s_logger.info('%s/%s applied for screening test with PIN %s' % (member_id,ref,pin_str))
                     break
                 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))
+                    
+                    if applicant.screening_type != screening_type and screening_type != 'manage':
+                        err = "Wrong application form!"
+                        s_logger.info('%s tried to use %s application form but has applied for %s' % (ref,
+                                                                                           screening_type,
+                                                                                           applicant.screening_type))
                         break
                     if not applicant.pin: