Changeset 3247

Timestamp:

28 Feb 2008, 06:48:14 (17 years ago)

Author:

Henrik Bettermann

Message:

fix and resolve ticket #491

File:

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

WAeUP_SRP/base/Widgets.py

@@ -1544 +1544 @@
                     datastructure['reg_no'] = ref
                     res = self.applicants_catalog(reg_no = ref)
-                    if res.screening_type != screening_type_request\
-                          and screening_type_request != 'manage':
-                        err = "You are using the wrong access form!"
-                        s_logger.info('%s tried to use %s application form but has applied for %s' % (ref,screening_type_request,applicant.screening_type))
-                        break                    
-                    if not res:
+                    if res:
+                        if getattr(res[0],'screening_type',None) != screening_type_request\
+                              and screening_type_request != 'manage':
+                            err = "You are using the wrong access form!"
+                            s_logger.info('%s tried to use %s application form but has applied for %s' % (ref,screening_type_request,getattr(res[0],'screening_type',None)))
+                            break
+                        s_logger.info('%s/%s repeatedly entered application record with PIN %s' % (member_id,ref,pin_str))
+                    else:
                         s_logger.info('%s successfully used PIN %s' % (ref,pin_str))
                         d = {}
@@ -1559 +1561 @@
                                                   pin_record.serial)
                         self.applicants_catalog.addRecord(**d)
-                    else:
-                        s_logger.info('%s/%s repeatedly entered application record with PIN %s' % (member_id,ref,pin_str))
+                        
             break
         if err: