Changeset 89 for waeup_product/trunk/skins

Timestamp:

26 Oct 2005, 11:54:25 (19 years ago)

Author:

joachim

Message:

=make workflows work

Location:

waeup_product/trunk/skins

Files:

• waeup_default/getWAeUPTypes.py (modified) (14 diffs)
• waeup_default/portlet_main_navigation.pt (modified) (1 diff)
• waeup_default/university_view.py (modified) (1 diff)
• waeup_default/university_view_all.pt (added)
• waeup_faculty/course_index_html.py (modified) (1 diff)
• waeup_faculty/department_index_html.py (modified) (1 diff)
• waeup_faculty/department_index_html.py~ (modified) (2 diffs)
• waeup_faculty/faculty_index_html.py (modified) (1 diff)
• waeup_student/create_jamb.py (modified) (1 diff)
• waeup_student/jamb_index_html.py (modified) (1 diff)
• waeup_student/student_index_html.py (modified) (1 diff)
• waeup_student/student_personal_index_html.py (modified) (1 diff)
• waeup_student/students_folder_view.py (modified) (1 diff)
• waeup_student/students_folder_view_all.pt (moved) (moved from waeup_product/trunk/skins/waeup_student/student_folder_view_all.pt)

waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py

@@ -32 +32 @@
                  'name': 'action_view',
                  'action': 'university_view',
+                 'condition': "python:'Manager' in member.getRoles()",
                  'permissions': (View,)},
                 {'id': 'addFaculty',
@@ -40 +41 @@
                  'name': 'action_folder_contents',
                  'action': 'folder_contents',
+                 'condition': "python:'Manager' in member.getRoles()",
                  'permissions': (ModifyPortalContent,UniversityManage,)},
                 {'id': 'edit',
@@ -45 +47 @@
                  'action': 'cpsdocument_edit_form',
                  #'action': 'cpsdocument_edit_form',
+                 'condition': "python:'Manager' in member.getRoles()",
                  'permissions': (ModifyPortalContent,UniversityManage,)},
                 {'id': 'metadata',
                  'name': 'action_metadata',
                  'action': 'cpsdocument_metadata',
-                 'condition': 'not:portal/portal_membership/isAnonymousUser',
+                 'condition': "python:'Manager' in member.getRoles()",
                  'permissions': (ModifyPortalContent,)},
                 {'id': 'localroles',
                  'name': 'action_local_roles',
                  'action': 'folder_localrole_form',
+                 'condition': 'not:portal/portal_membership/isAnonymousUser',
                  'permissions': (ChangePermissions,)},
                  )
@@ -82 +86 @@
                  'name': 'Students',
                  'action': 'students_folder_view',
+                 'condition': "python:'Manager' in member.getRoles()",
                  'permissions': (View,)},
                 {
@@ -87 +92 @@
                 'name'      : 'Add Content',
                 'action'    : 'string:${object/absolute_url}/folder_factories',
+                 'condition': "python:'Manager' in member.getRoles()",
                 'permissions': (StudentManage,)},
                 {
@@ -134 +140 @@
     'cps_section_wf': 'waeup_section_wf',
     'use_content_status_history': 0,
-    'actions_add': (
+    'actions': (
          {'id': 'view',
           'name': 'action_view',
@@ -143 +149 @@
           'category': 'object',
           'visible': True,},
+         {'id': 'metadata',
+          'name': 'action_metadata',
+          'action': 'cpsdocument_metadata',
+          'condition': "python:'Manager' in member.getRoles()",
+          'permissions': (UniversityManage,)},
           )
 }
@@ -223 +234 @@
     'cps_workspace_wf': 'workspace_content_wf',
     'cps_section_wf': 'section_content_wf',
-    'actions_add': (
+    'actions': (
          {'id': 'view',
           'name': 'action_view',
           'action': 'string:${object_url}/jamb_index_html',
-          #'action': 'string:${object_url}/cpsdocument_view',
-          'condition': '',
-          'permission': ('View',),
-          'category': 'object',
-          'visible': True,},
+          'condition': '',
+          'permission': (View,),
+          'visible': True,},
+         {'id': 'edit',
+          'name': 'action_edit',
+          'action': 'string:${object_url}/waeup_edit_form',
+          'condition': '',
+          'permission': (ModifyPortalContent,StudentManage),
+          },
+          {
+          'id'        : 'add_content',
+          'name'      : 'Add Content',
+          'action'    : 'string:${object/absolute_url}/folder_factories',
+          'condition': "python:'Manager' in member.getRoles()",
+          'permissions': (StudentManage,)},
+         {'id': 'metadata',
+          'name': 'action_metadata',
+          'action': 'cpsdocument_metadata',
+          'condition': "python:'Manager' in member.getRoles()",
+          'permissions': (UniversityManage,)},
           )
 }
@@ -241 +267 @@
     'content_icon': '',
     'content_meta_type': 'CPS Document',
-    'product': 'CPSDocument',
-    'factory': 'addCPSDocument',
-    'immediate_view': 'cpsdocument_view',
+    'product': 'WAeUP',
+    'factory': 'addStudentPersonal',
+    'immediate_view': 'student_personal_index_html',
     'global_allow': True,
     'filter_content_types': True,
@@ -259 +285 @@
     'cps_workspace_wf': 'workspace_content_wf',
     'cps_section_wf': 'section_content_wf',
-    'actions_add': (
+    'actions': (
          {'id': 'view',
           'name': 'action_view',
@@ -275 +301 @@
           'category': 'object',
           'visible': True,},
+         {'id': 'metadata',
+          'name': 'action_metadata',
+          'action': 'cpsdocument_metadata',
+          'condition': "python:'Manager' in member.getRoles()",
+          'permissions': (UniversityManage,)},
           )
 }
@@ -300 +331 @@
     'cps_section_wf': 'waeup_section_wf',
     'use_content_status_history': 0,
-    'actions_add': (
+    'actions': (
          {'id': 'view',
           'name': 'action_view',
@@ -340 +371 @@
     'cps_section_wf': 'waeup_section_wf',
     'use_content_status_history': 0,
-    'actions_add': (
+    'actions': (
          {'id': 'view',
           'name': 'action_view',
@@ -380 +411 @@
     'cps_section_wf': 'waeup_section_wf',
     'use_content_status_history': 0,
-    'actions_add': (
+    'actions': (
          {'id': 'view',
           'name': 'action_view',

waeup_product/trunk/skins/waeup_default/portlet_main_navigation.pt

@@ -4 +4 @@
                    folder_id python:str(user)"
                    >
-  <tal:block condition="python: 'Students' in user.getGroups()">
+  <tal:block condition="python: 0 and 'Students' in user.getGroups()">
     <a href="" i18n:translate=""
        tal:attributes="href string:${here/portal_url}/sections/waeup/students/${folder_id}"
        tal:content="string: Personal area for JAMB Registration ${folder_id}"></a>
   </tal:block>
-  <tal:block condition="python: 'StudentManager' in user.getGroups()">
+  <tal:block condition="python: 1">
     <a href="" i18n:translate=""
        tal:attributes="href string:${here/portal_url}/sections/waeup/students"

waeup_product/trunk/skins/waeup_default/university_view.py

@@ -6 +6 @@
 
 member = context.portal_membership.getAuthenticatedMember()
-#return context.folder_view()
+
 if member:
     if 'Manager' in member.getRoles():
         return context.folder_view()
-    elif 'Students' in member.getGroups():
-        return context.students.students_folder_view_student(psm=psm,groups=groups)
-    elif 'StudentManager' in member.getGroups():
-        return context.waeup_view_manager(psm=psm,groups=groups)
-return context.students.students_folder_view_anon(psm=psm,groups=groups)
+return context.university_view_all(psm=psm)

waeup_product/trunk/skins/waeup_faculty/course_index_html.py

@@ -5 +5 @@
 """Default view for the Student."""
 member = context.portal_membership.getAuthenticatedMember()
+if member:
+    roles = member.getRoles()
+    if 'Manager' in roles:
+        return context.cpsdocument_view()
+    elif 'StudentManager' in roles:
+        return context.course_view_manager()
+return context.course_view_student()
 
-#return context.student_view_manager()
-if member:
-    if 'Manager' in member.getRoles():
-        return context.cpsdocument_view()
-    elif 'StudentManager' in member.getGroups():
-        return context.course_view_manager()
-    elif 'Students' in member.getGroups():
-        return context.course_view_student()

waeup_product/trunk/skins/waeup_faculty/department_index_html.py

@@ -5 +5 @@
 """Default view for a Faculty."""
 member = context.portal_membership.getAuthenticatedMember()
-
-#return context.student_view_manager()
 if member:
-    if 'StudentManager' in member.getGroups():
-    #if 'Manager' in member.getRoles():
+    roles = member.getRoles()
+    if 'Manager' in roles:
+        return context.folder_view()
+    elif 'StudentManager' in roles:
         return context.department_view_manager()
-    elif 'Students' in member.getGroups():
-        return context.department_view_student()
+return context.department_view_student()

waeup_product/trunk/skins/waeup_faculty/department_index_html.py~

@@ -1 +1 @@
 ##parameters=post_id=None, REQUEST=None
 
-# $Id: department_index_html.py 80 2005-10-22 13:43:45Z joachim $
+# $Id: department_index_html.py 84 2005-10-25 16:18:40Z joachim $
 
 """Default view for a Faculty."""
@@ -8 +8 @@
 #return context.student_view_manager()
 if member:
-    if 'Manager' in member.getRoles():
+    if 'StudentManager' in member.getGroups():
+    #if 'Manager' in member.getRoles():
         return context.department_view_manager()
     elif 'Students' in member.getGroups():

waeup_product/trunk/skins/waeup_faculty/faculty_index_html.py

@@ -6 +6 @@
 member = context.portal_membership.getAuthenticatedMember()
 
-#return context.student_view_manager()
-#if 'Manager' in member.getRoles():
-if 'StudentManager' in member.getGroups():
-    return context.faculty_view_manager()
-elif 'Students' in member.getGroups():
-    return context.faculty_view_student()
+member = context.portal_membership.getAuthenticatedMember()
+if member:
+    roles = member.getRoles()
+    if 'Manager' in roles:
+        return context.folder_view()
+    elif 'StudentManager' in roles:
+        return context.faculty_view_manager()
+return context.faculty_view_student()

waeup_product/trunk/skins/waeup_student/create_jamb.py

@@ -52 +52 @@
     noCPSMember = False
     try:
-        pr.addMember(s_id, 'UnSeT',roles=('Member','CPSMember'))
+        pr.addMember(s_id, 'UnSeT',roles=('Member','CPSMember','Student'))
     except:
         noCPSMember = True
     if noCPSMember:
         pr.addMember(s_id, 'UnSeT',roles=('Member',))
-    groups = context.portal_directories.groups
-    gm = list(groups.getEntry('Students')['members'])
-    gm.extend((s_id,))
-    groups.editEntry({'group': 'Students', 
-                      'members': gm})  
+##    groups = context.portal_directories.groups
+##    gm = list(groups.getEntry('Students')['members'])
+##    gm.extend((s_id,))
+##    groups.editEntry({'group': 'Students', 
+##                      'members': gm})  
     return context.students_folder_view_manager(psm=psm)
 ##    return context.create_jamb_form(rendered = res,

waeup_product/trunk/skins/waeup_student/jamb_index_html.py

@@ -7 +7 @@
 
 #return context.student_view_manager()
-if 'StudentManager' in member.getGroups():
-    return context.jamb_view_manager()
-elif 'Students' in member.getGroups():
-    return context.jamb_view_student()
+if member:
+    roles = member.getRoles()
+    if 'Manager' in roles:
+        return context.cpsdocument_view()
+    elif 'StudentManager' in roles:
+        return context.jamb_view_manager()
+return context.jamb_view_student()

waeup_product/trunk/skins/waeup_student/student_index_html.py

@@ -8 +8 @@
 #return context.student_view_manager()
 if member:
-    if 'Manager' in member.getRoles():
+    roles = member.getRoles()
+    if 'Manager' in roles:
         return context.folder_view()
-    elif 'StudentManager' in member.getGroups():
+    elif 'StudentManager' in roles:
         return context.student_view_manager()
-    elif 'Students' in member.getGroups():
-        return context.student_view_student()
+return context.student_view_student()

waeup_product/trunk/skins/waeup_student/student_personal_index_html.py

@@ -7 +7 @@
 
 #return context.student_view_manager()
-if 'StudentManager' in member.getGroups():
-    return context.student_personal_view_manager()
-elif 'Students' in member.getGroups():
-    return context.student_personal_view_student()
+if member:
+    roles = member.getRoles()
+    if 'Manager' in roles:
+        return context.cpsdocument_view()
+    elif 'StudentManager' in roles:
+        return context.student_personal_view_manager()
+return context.student_personal_view_student()

waeup_product/trunk/skins/waeup_student/students_folder_view.py

@@ -9 +9 @@
 member = context.portal_membership.getAuthenticatedMember()
 if member:
-    if 'Manager' in member.getRoles():
+    roles = member.getRoles()
+    if 'Manager' in roles:
         return context.folder_view()
+    elif 'StudentManager' in roles:
+        return context.students_folder_view_manager(psm=psm)
+    elif 'Student' in roles:
+        return context.students_folder_view_student(psm=psm)
 return context.students_folder_view_all(psm=psm)