Changeset 3339 for WAeUP_SRP/base/skins

Timestamp:

16 Mar 2008, 08:38:39 (17 years ago)

Author:

Henrik Bettermann

Message:

resolve ticket #507

Now we need a fix which replaces current_mode of all students by the certificate study_mode value.

Location:

WAeUP_SRP/base/skins

Files:

• waeup_academics/getCertificatesDict.py (added)
• waeup_academics/getCertificatesList.py (deleted)
• waeup_academics/getCertificatesVoc.py (modified) (2 diffs)
• waeup_academics/getDepartmentsVoc.py (modified) (1 diff)
• waeup_academics/getFacultiesVoc.py (modified) (2 diffs)
• waeup_student/admitStudents.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_academics/getCertificatesVoc.py

@@ -1 @@
-##parameters=key=None 
+##parameters=key=None
 # $Id$
 """
@@ -6 +6 @@
 """
 if key is None:
-    res = context.portal_catalog.search({'meta_type': "Certificate"})    
+    res = context.portal_catalog.search({'meta_type': "Certificate"})
     return [(d.getId,d.Title,) for d in res]
 res = context.portal_catalog.search({'meta_type': "Certificate", 'id': key})
 if res:
-    return [-1].Title
+    return res[0].Title
 raise KeyError

WAeUP_SRP/base/skins/waeup_academics/getDepartmentsVoc.py

@@ -6 +6 @@
 """
 if key is None:
-    res = context.portal_catalog.search({'meta_type': "Department"})    
+    res = context.portal_catalog.search({'meta_type': "Department"})
     return [(d.getId(),d.Title,) for d in res]
 res = context.portal_catalog.search({'meta_type': "Department", 'id': key})
 if res:
-    return res[-1].Title
+    return res[0].Title
 
 raise KeyError

WAeUP_SRP/base/skins/waeup_academics/getFacultiesVoc.py

@@ -1 @@
-##parameters=key=None 
+##parameters=key=None
 # $Id$
 """
@@ -6 +6 @@
 """
 if key is None:
-    res = context.portal_catalog.search({'meta_type': "Faculty"})    
+    res = context.portal_catalog.search({'meta_type': "Faculty"})
     return [(d.getId,d.Title,) for d in res]
 res = context.portal_catalog.search({'meta_type': "Faculty", 'id': key})
 if res:
-    return [-1].Title
+    return res[0].Title
 raise KeyError

WAeUP_SRP/base/skins/waeup_student/admitStudents.py

@@ -52 +52 @@
         context.waeup_tool.doCommit()
         logger.info("Committing %s transactions, total %s" % (commit_after,count))
-        # cocount += 1
-        # if cocount > 1:
-        #     break
+        cocount += 1
+        if cocount > 1:
+            break
     brain = aq_applicants(Eq('reg_no',reg_no))[0]
     #logger.info("start creating  objects of student %s" % (brain.reg_no))