Changeset 1221

Timestamp:

7 Jan 2007, 10:47:01 (18 years ago)

Author:

Henrik Bettermann

Message:

rolemap changed
condition for actions changed
delegetion of roles in students folder disabled

Location:

WAeUP_SRP/trunk

Files:

• exportimport.py (modified) (1 diff)
• profiles/default/actions.xml (modified) (5 diffs)
• profiles/default/rolemap.xml (modified) (1 diff)
• profiles/default/types/StudentsFolder.xml (modified) (1 diff)
• skins/waeup_student/getMemberInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/exportimport.py

@@ -85 +85 @@
             students.manage_setLocalGroupRoles(groupid = 'ClearanceOfficers',
                                               roles=('SectionReader',))
+            students.manage_setLocalGroupRoles(groupid='MemberAdmins',
+                                         roles=('SectionOfficer',))                                         
             students.manage_setLocalGroupRoles(groupid = 'role:Student',
                                               roles=('SectionReader',))
         if accommodation is not None:
             accommodation.manage_setLocalGroupRoles(groupid='role:Student',
-                                         roles=('SectionReader',))                                              
+                                         roles=('SectionReader',))
     members = getattr(site.portal_directories,'members')
     if members is not None:

WAeUP_SRP/trunk/profiles/default/actions.xml

@@ -13 +13 @@
   </action>
   <action title="Staff Login" action_id="login_staff" category="student"
-     condition_expr="not: member"
-     url_expr="string:${portal_url}/login_staff"
+     condition_expr="not: member" url_expr="string:${portal_url}/login_staff"
      visible="True">
    <permission>View</permission>
@@ -37 +36 @@
   </action>
   <action title="Student Login" action_id="login_student" category="student"
-     condition_expr="not:member"
-     url_expr="string:${portal_url}/login_student"
+     condition_expr="not:member" url_expr="string:${portal_url}/login_student"
      visible="True">
    <permission>View</permission>
@@ -93 +91 @@
   </action>
   <action title="Directories" action_id="directories" category="global"
-     condition_expr="here/isSectionManager"
+     condition_expr="python:portal.portal_directories.isSectionOfficer()"
      url_expr="string:${portal_url}/cpsdirectory_view" visible="True">
-   <permission>Modify portal content</permission>
+   <permission>View</permission>
   </action>
   <action title="Portal Members" action_id="members" category="global"
-     condition_expr="member"
-     url_expr="string:${portal_url}/search_members_form" visible="True">
-   <permission>Modify portal content</permission>
+     condition_expr="python:portal.portal_directories.members.isSectionOfficer()"
+     url_expr="string:${portal_url}/search_members_form"
+     visible="True">
+   <permission>View</permission>
   </action>
   <action title="Home" action_id="home" category="navigation"
-     condition_expr="member" url_expr="string:${portal_url}/campus" visible="True">
+     condition_expr="member" url_expr="string:${portal_url}/campus"
+     visible="True">
    <permission>View</permission>
   </action>
@@ -117 +117 @@
   </action>
   <action title="Students" action_id="view_students" category="navigation"
-     condition_expr="member"
+     condition_expr="python:portal.campus.students.isStaff()"
      url_expr="string:${portal_url}/campus/students" visible="True">
    <permission>View</permission>
@@ -131 +131 @@
    <permission>View</permission>
   </action>
-  <action title="Enquiries" action_id="support_anon" category="student_navigation"
-     condition_expr="not:member" url_expr="string:${portal_url}/contact_admin_form"
-     visible="True">
+  <action title="Enquiries" action_id="support_anon"
+     category="student_navigation" condition_expr="not:member"
+     url_expr="string:${portal_url}/contact_admin_form" visible="True">
    <permission>View</permission>
   </action>

WAeUP_SRP/trunk/profiles/default/rolemap.xml

@@ -43 +43 @@
       <role name="SectionOfficer"/>
     </permission>
+    <permission name="Add portal members" acquire="True">
+      <role name="SectionManager"/>
+      <role name="SectionOfficer"/>
+    </permission>    
     <permission name="Review portal content" acquire="True">
       <role name="Owner"/>

WAeUP_SRP/trunk/profiles/default/types/StudentsFolder.xml

@@ -43 +43 @@
  <action title="Delegate" action_id="localroles" category="object"
     condition_expr="here/isSectionOfficer" url_expr="string:${object_url}/folder_localrole_form"
-    visible="True">
+    visible="False">
   <permission value="Modify portal content"/>
  </action>

WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py

@@ -45 +45 @@
 info['per_doc'] = student.personal.getContent()
 info['app_doc'] = student.personal.getContent()
+#info['password'] = member.getPassword()
 return info