Index: /WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py
===================================================================
--- /WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py	(revision 1548)
+++ /WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py	(revision 1549)
@@ -78,5 +78,5 @@
             break
 
-
+        #from pdb import set_trace;set_trace()
         # can be later simplified by replacing by students_catalog values - Henrik
         # getattr works always because of acquisition ?! Henrik
@@ -85,9 +85,11 @@
             break
         sc_obj = sc.getContent()
-        res_sc = self.portal_catalog(portal_type="Certificate",
-                                     id = sc_obj.study_course)
-        if len(res_sc) != 1:
+        cert_id = sc_obj.study_course
+        res_cert = self.portal_catalog(id = cert_id)
+        if len(res_cert) != 1:
             break
-        cert_path = res_sc[0].getPath().split('/')
+        certificate_brain = res_cert[0]
+        certificate_obj = certificate_brain.getObject()
+        cert_path = certificate_brain.getPath().split('/')
         fac_id = cert_path[-4]
         dep_id = cert_path[-3]
@@ -98,16 +100,24 @@
         if len(res) != 1:
             break
-        self.students_catalog.modifyRecord(id = student_id,
+        st_entry = res[0]
+        if st_entry.faculty != fac_id or\
+           st_entry.department != dep_id or\
+           st_entry.course != cert_id:
+               self.students_catalog.modifyRecord(id = student_id,
                                                 faculty = fac_id,
                                                 department = dep_id,
-                                                course = sc_obj.study_course,
+                                                course = cert_id
                                                 )
-
-
-        res = self.portal_catalog(portal_type="Department",id=dep_id)
-        if len(res) != 1:
-            break
-        dynamic_roles = self.getRolesInContext(res[0].getObject())
-        for dr in ('ClearanceOfficer','CourseAdviser', 'SectionManager'):
+        if real_object.portal_type == "StudentStudyLevel":
+            context_obj = getattr(certificate_obj,real_object.getId())
+            allowed = ('CourseAdviser', 'SectionManager')
+        else:
+            res = self.portal_catalog(portal_type="Department",id=dep_id)
+            allowed = ('ClearanceOfficer', 'SectionManager')
+            if len(res) != 1:
+                break
+            context_obj = res[0].getObject()
+        dynamic_roles = self.getRolesInContext(context_obj)
+        for dr in allowed:
             if dr in dynamic_roles:
                 roles.append(dr)
