Changeset 881

Timestamp:

16 Nov 2006, 22:42:08 (18 years ago)

Author:

joachim

Message:

some fixes and renames

Location:

WAeUP_SRP/trunk

Files:

• PatchCPSUserFolderUserFolder.py (copied) (copied from WAeUP_SRP/trunk/PatchCPSUserFolderUserFolderWithGroups.py) (4 diffs)
• PatchCPSUserFolderUserFolderWithGroups.py (modified) (1 diff)
• __init__.py (modified) (1 diff)
• exportimport.py (modified) (1 diff)
• skins/waeup_student/co_searchStudents.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/co_search.py) (4 diffs)
• skins/waeup_student/co_search_view.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_student/co_search_form.pt)
• skins/waeup_student/students_index.py (modified) (1 diff)

WAeUP_SRP/trunk/PatchCPSUserFolderUserFolder.py

@@ -8 +8 @@
 security.declarePublic('getRolesInContext')
 def getRolesInContext(self, object):
-    """Return the list of roles assigned to the user,
-       including local roles assigned in context of
-       the passed in object."""
+    """Get the list of roles assigned to the user.
+    This includes local roles assigned in the context of
+    the passed in object.
+    Knows about local roles blocking (roles starting with '-').
+    """
     name = self.getUserName()
     roles = self.getRoles()
-    groups = self.getGroups() + ('role:Anonymous',)
-    if 'Authenticated' in roles:
-        groups = groups + ('role:Authenticated',)
+    # deal with groups
+    groups = self.getComputedGroups()
+    # end groups
     local = {}
     stop_loop = 0
+    real_object = object
     object = aq_inner(object)
     while 1:
@@ -55 +58 @@
         if stop_loop:
             break
-        inner = getattr(object, 'aq_inner', object)
-        parent = getattr(inner, 'aq_parent', None)
-        if parent is not None:
-            object = parent
+        if hasattr(object, 'aq_parent'):
+            object = aq_inner(object.aq_parent)
             continue
         if hasattr(object, 'im_self'):
-            object = object.im_self
-            object = getattr(object, 'aq_inner', object)
+            object = aq_inner(object.im_self)
             continue
         break
@@ -70 +70 @@
             roles.append(r)
     ## patch to assign dynamic roles for WAeUP
-    info = self.getStudentInfo()
     while 1:
-        if info is None:
+        if not hasattr(real_object,'portal_type'):
             break
-        if info['course'] is None:
+        if real_object.portal_type != "Student":
             break
-        res = self.portal_catalog(portal_type="Department",id=info['course_doc'].department)
+        #import pdb;pdb.set_trace()
+        dep_id = real_object.study_course.getContent().department
+        res = self.portal_catalog(portal_type="Department",id=dep_id)
         if len(res) != 1:
             break
@@ -86 +87 @@
     return roles
 
-security.declarePublic('allowed')
-def allowed(self, object, object_roles=None):
-    """Check whether the user has access to object. The user must
-       have one of the roles in object_roles to allow access."""
-
-    if object_roles is _what_not_even_god_should_do:
-        return 0
-
-    # Short-circuit the common case of anonymous access.
-    if object_roles is None or 'Anonymous' in object_roles:
-        return 1
-
-    # Provide short-cut access if object is protected by 'Authenticated'
-    # role and user is not nobody
-    if 'Authenticated' in object_roles and (
-        self.getUserName() != 'Anonymous User'):
-        return 1
-
-    # Check for a role match with the normal roles given to
-    # the user, then with local roles only if necessary. We
-    # want to avoid as much overhead as possible.
-    user_roles = self.getRoles()
-    for role in object_roles:
-        if role in user_roles:
-            if self._check_context(object):
-                return 1
-            return None
-
-    # Check local roles, calling getRolesInContext to avoid too much
-    # complexity, at the expense of speed.
-    for role in self.getRolesInContext(object):
-        if role in object_roles:
-            return 1
-
-    return None
-
-from Products.CPSUserFolder import UserFolderWithGroups  
-UserFolderWithGroups.getRolesInContext = getRolesInContext
-UserFolderWithGroups.allowed = allowed
+from Products.CPSUserFolder.CPSUserFolder import CPSUser
+CPSUser.getRolesInContext = getRolesInContext

WAeUP_SRP/trunk/PatchCPSUserFolderUserFolderWithGroups.py

@@ -19 +19 @@
     stop_loop = 0
     object = aq_inner(object)
+    import pdb; pdb.set_trace()
     while 1:
         # Collect all roles info

WAeUP_SRP/trunk/__init__.py

@@ -14 +14 @@
 import PatchCatalogToolXMLAdapter
 import PatchCPSSchemasAttributeStorageAdapter
+import PatchCPSUserFolderUserFolderWithGroups
+import PatchCPSUserFolderUserFolder
 import PatchBasicWidgetsCPSStringWidget
-import PatchCPSUserFolderUserFolderWithGroups
 # Only for CPS 3.4.1. In 3.4.2 and later this should be fixed.
 import PatchCPSDefaultImportExport

WAeUP_SRP/trunk/exportimport.py

@@ -74 +74 @@
     site = context.getSite()
     pm = site.portal_membership
-    pm.setLocalGroupRoles(site,['role:Authenticated',],'SectionReader')
+    #pm.setLocalGroupRoles(site,['group:ClearanceOfficers',],'SectionReader')
 
     importWAeUPTable(site.portal_accommodation, '', context,'accommodation')

WAeUP_SRP/trunk/skins/waeup_student/co_searchStudents.py

@@ -1 @@
-## Script (Python) "co_search"
+## Script (Python) "co_searchStudents"
 ##bind container=container
 ##bind context=context
@@ -62 +62 @@
                       ob=default,
                       layout_mode='edit',
-                      formaction="co_search"
+                      formaction="co_searchStudents"
                       )
 if psm == '':
@@ -160 +160 @@
 if items:
     for item in items:
-        info = context.getStudentInfo(item)
-        if context.isClearanceOfficer(info):
+        #if context.isClearanceOfficer(info):
+        droles = member.getRolesInContext(item)
+        if "ClearanceOfficer" in droles:
+            info = context.getStudentInfo(item)
             students.append(info)
-    return context.co_search_form(rendered = rend,
+    return context.co_search_view(rendered = rend,
                              psm = "%d,%d matching Students found QS = %s" %\
                                     (len(review_set),len(search_set),query_step),
@@ -170 +172 @@
                              is_manager = is_manager,
                              )
-return context.co_search_form(rendered = rend,
+return context.co_search_view(rendered = rend,
                              psm = """Step: %s found: %s Your search for "%s" in %s with state %s failed.<br\>%s""" % (query_step,len(items),st,what,state,bools),
                              students = students,

WAeUP_SRP/trunk/skins/waeup_student/students_index.py

@@ -24 +24 @@
 
 if "ClearanceOfficers" in member.getGroups():
-    return redirect("%s/co_search" % students_url)
+    return redirect("%s/co_searchStudents" % students_url)
 if context.isManager():
     return redirect("%s/searchStudents" % students_url)