Changeset 167

Timestamp:

12 Nov 2005, 16:17:03 (19 years ago)

Author:

joachim

Message:

=some fixes

Location:

waeup_product/trunk

Files:

• WAeUPPermissions.py (modified) (1 diff)
• skins/waeup_default/temporary_view_all.py (modified) (1 diff)

waeup_product/trunk/WAeUPPermissions.py

@@ -32 +32 @@
 UniversityManage = "University Manage"
 setDefaultRoles(UniversityManage, ('Manager', 
-                                   'Owner',))
+                                   ))
 #  - 'Student Manage' : Permission you need to manage Students
 #

waeup_product/trunk/skins/waeup_default/temporary_view_all.py

@@ -11 +11 @@
 request = context.REQUEST
 url0 = request.get('URL0')
+#return context.temporary_view_all_form(psm=psm)
 if context.portal_membership.isAnonymousUser():
     return context.temporary_view_all_form(psm=psm)
 else:
-    if url0.find(uname) > 0 or 'UniversityManager' in roles:
+    if url0.find(uname) > 0 or 'UniversityManager' in roles or 'Manager' in roles:
         return context.temporary_view_all_form(psm=psm)
-    elif 'Student' in roles:
-        res = cat(id=uname)
-        if len(res) > 0:
-            return res[0].getObject().temporary_view_all_form(psm=psm)
+    elif 'Student' in roles and 'StudentManager' not in roles:
+        res = cat(pathindex="/portal/sections/students/%s" % uname)
+        for r in res:
+            if r.getPath().endswith("students/%s" % uname):
+                return r.getObject().temporary_view_all_form(psm=psm)
         return context.temporary_view_all_form(psm=psm)