Index: /WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py
===================================================================
--- /WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py	(revision 1075)
+++ /WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py	(revision 1076)
@@ -71,5 +71,4 @@
     ## patch to assign dynamic roles for WAeUP
     while 1:
-        #import pdb; pdb.set_trace()
         if callable(real_object) and hasattr(real_object,'im_self'):
             real_object = real_object.im_self
@@ -80,5 +79,6 @@
         if sc is None:
             break
-        res = self.students_catalog(id=self.getStudentId())
+        student_id = self.getStudentId()
+        res = self.students_catalog(id=student_id)
         if len(res) != 1:
             break
@@ -86,5 +86,19 @@
         res = self.portal_catalog(portal_type="Department",id=dep_id)
         if len(res) != 1:
-            break
+            #import pdb; pdb.set_trace()
+            res_sc = self.portal_catalog(portal_type="Certificate",
+                                         id = sc.getContent().study_course)
+            if len(res_sc) != 1:
+                break
+            cert_path = res_sc[0].getPath().split('/')
+            fac_id = cert_path[-4]
+            dep_id = cert_path[-3]
+            res = self.portal_catalog(portal_type="Department",id=dep_id)
+            if len(res) != 1:
+                break
+            self.students_catalog.modifyRecord(id = student_id,
+                                                  faculty = fac_id,
+                                                  department = dep_id,
+                                                  )
         dynamic_roles = self.getRolesInContext(res[0].getObject())
         for dr in ('ClearanceOfficer','CourseAdviser', 'SectionManager'):
