Changeset 2476 for WAeUP_SRP/base

Timestamp:

29 Oct 2007, 21:53:10 (17 years ago)

Author:

Henrik Bettermann

Message:

move verdict also after interswitch payment

Location:

WAeUP_SRP/base/skins

Files:

• waeup_epayment/interswitch_cb.py (modified) (1 diff)
• waeup_student/getStudyCourseInfo.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_epayment/interswitch_cb.py

@@ -93 +93 @@
             pass
         verdict = s_brain.verdict
+        if verdict == 'N/A':
+            verdict = ''
         study_course.getContent().edit(mapping= {'current_level': next_level_id,
                                                  'current_session': next_session_id,
+                                                 'current_verdict': next_verdict,
                                                  'previous_verdict': verdict,
                                                  })

WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

@@ -84 +84 @@
 info['items'] = items
 
-try:
-    info['verdict'] = context.portal_vocabularies.verdicts.get(info['doc'].current_verdict).upper()
-except:
-    info['verdict'] = course.current_verdict
-try:
-    info['previous_verdict'] = context.portal_vocabularies.verdicts.get(info['doc'].previous_verdict).upper()
-except:
-    info['previous_verdict'] = course.previous_verdict
-
+if hasattr(course,'current_verdict'):
+    try:
+        info['verdict'] = context.portal_vocabularies.verdicts.get(course.current_verdict).upper()
+    except:
+        info['verdict'] = course.current_verdict
+else:
+    info['verdict'] = ''   
+     
+if hasattr(course,'previous_verdict'):        
+    try:
+        info['previous_verdict'] = context.portal_vocabularies.verdicts.get(course.previous_verdict).upper()
+    except:
+        info['previous_verdict'] = course.previous_verdict
+else:
+    info['previous_verdict'] = ''
+    
 return info