Changeset 2541 for WAeUP_SRP/base

Timestamp:

6 Nov 2007, 09:01:09 (17 years ago)

Author:

Henrik Bettermann

Message:

vocabularies fixed
better error messages for logged in members

File:

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

WAeUP_SRP/base/Widgets.py

@@ -1383 +1383 @@
         if self.isStaff():
             do = 0
-            err ='You are not a Student. PIN neither checked nor used.'
+            err ='You are logged in, please log out. PIN neither checked nor used.'
             s_logger.info('%s tried to use scratch card %s' % (member_id,pin_str))
+        elif self.isStudent():
+            do = 0
+            err ='You are logged in, please log out. PIN neither checked nor used.'
+            s_logger.info('%s/%s applied for screening test with PIN %s' % (member_id,ref,pin_str))
         elif len(b) > 1 and b.find('-') > -1:
             do = 0
@@ -1426 +1430 @@
                 #screening_type = self.REQUEST.form.get('screening_type','unknown')
                 #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!"
-                    s_logger.info('%s/%s applied for screening test with PIN %s' % (member_id,ref,pin_str))
-                    break
-                elif datastructure.has_key('record'):
+
+                if datastructure.has_key('record'):
                     applicant = datastructure['record']
                     if applicant.screening_type != screening_type_request\