Changeset 119 for waeup_product/trunk/skins

Timestamp:

28 Oct 2005, 19:44:25 (19 years ago)

Author:

Henrik Bettermann

Message:

bug fixes

Location:

waeup_product/trunk/skins

Files:

• waeup_default/getWAeUPTypes.py (modified) (12 diffs)
• waeup_faculty/academics_view_all.pt (modified) (1 diff)
• waeup_student/accommodation_index_html.py (modified) (2 diffs)
• waeup_student/accommodation_view_all.pt (modified) (2 diffs)
• waeup_student/accommodation_view_manager.pt (modified) (2 diffs)
• waeup_student/accommodation_view_student.pt (modified) (2 diffs)
• waeup_student/add_accommodation.py (modified) (2 diffs)

waeup_product/trunk/skins/waeup_default/getWAeUPTypes.py

@@ -51 +51 @@
                  'action': 'folder_contents',
                  'condition': "python:member and  'Manager' in member.getRoles()",
-                 'condition': "",
                  'permissions': (ModifyPortalContent,)},
                 {'id': 'edit',
@@ -106 +105 @@
                 {
                 'id'        : 'add_jamb',
-                'name'      : 'Add Student JAMB',
+                'name'      : 'Add JAMB Data',
                 'action'    : 'string:${object/absolute_url}/create_jamb',
                 'permissions': (UniversityManage,StudentManage)},
-          {'id': 'localroles',
-          'name': 'delegate',
-          'action': 'folder_localrole_form',
-          'permissions': (UniversityManage,)
-          },
+                {
+                'id': 'localroles',
+                 'name': 'delegate',
+                 'action': 'folder_localrole_form',
+                 'permissions': (ModifyPortalContent),
+                 'visible' : 0,
+                },
 ##                {'id': 'contents',
 ##                 'name': 'action_folder_contents',
@@ -159 +160 @@
                  'permissions': (View,)},
                 {'id': 'add_faculty',
-                 'name': 'Add a Faculty',
+                 'name': 'Add Faculty',
                  'condition': "python:member and 'UniversityManager'in member.getRoles()",
                  'action'    : 'string:${object/absolute_url}/create_common?type_name=Faculty',
@@ -208 +209 @@
           'condition': "python:member and 'Manager' in member.getRoles()",
           'permissions': (UniversityManage,)},
-          {'id': 'localroles',
+         {'id': 'localroles',
           'name': 'delegate',
           'action': 'folder_localrole_form',
-          'permissions': (UniversityManage,)
+          'permissions': (ModifyPortalContent),
+          'visible' : 0,
           },
           )
@@ -306 +308 @@
           'permission': (ModifyPortalContent,StudentManage),
           },
-          {'id': 'localroles',
+         {'id': 'localroles',
           'name': 'delegate',
           'action': 'folder_localrole_form',
-          'permissions': (UniversityManage,)
+          'permissions': (ModifyPortalContent),
+          'visible' : 0,
           },
           {
@@ -407 +410 @@
           'visible': True,},
           {'id': 'add_department',
-          'name': 'Add a Department',
+          'name': 'Add Department',
           'action'    : 'string:${object/absolute_url}/create_common?type_name=Department',
           'permissions': (ModifyPortalContent,UniversityManage,)},
@@ -428 +431 @@
           'name': 'delegate',
           'action': 'folder_localrole_form',
-          'permissions': (UniversityManage,)
+          'permissions': (ModifyPortalContent),
+          'visible' : 0,
           },
           )
@@ -469 +473 @@
           'visible': True,},
           {'id': 'create_course',
-          'name': 'Add a Course',
+          'name': 'Add Course',
           'action'    : 'string:${object/absolute_url}/create_course',
           'permissions': (ModifyPortalContent,UniversityManage,)},
@@ -490 +494 @@
           'name': 'delegate',
           'action': 'folder_localrole_form',
-          'permissions': (UniversityManage,)
-          },
-          )
-}
-###)
-
-course_type = { ###(  
+          'permissions': (ModifyPortalContent),
+          'visible' : 0,
+          },
+          )
+}
+###)
+
+course_type = { ###(
     'title': 'WAeUP Course',
     'description': '',
@@ -550 +555 @@
           'name': 'delegate',
           'action': 'folder_localrole_form',
-          'permissions': (UniversityManage,)
+          'permissions': (ModifyPortalContent),
+          'visible' : 0,
           },
           )
@@ -586 +592 @@
           'visible': True,},
           {'id': 'add_accommodation',
-          'name': 'Add an Accommodation Hall',
-          'condition': "python:member and not 'Student'in member.getRoles()",
+          'name': 'Add Accommodation Hall',
+          'condition': "python:member and 'UniversityManager'in member.getRoles()",
           'action'    : 'add_accommodation',
           #'action': 'folder_factories',
@@ -606 +612 @@
 ###)
 
-accommodation = { ###(  
+accommodation = { ###(
     'title': 'WAeUP Accommodation',
     'description': '',

waeup_product/trunk/skins/waeup_faculty/academics_view_all.pt

@@ -15 +15 @@
   <metal:block fill-slot="main"
                tal:define="items here/contentValues">
-    <h2>The Faculties</h2>
+    <h2>Academics (Faculties)</h2>
     <table cellspacing="0" cellpadding="0">
       <tal:block condition="python: len(items)">

waeup_product/trunk/skins/waeup_student/accommodation_index_html.py

@@ -3 +3 @@
 # $Id$
 
-"""Default view for the Accommodation. 
+"""Default view for the Accommodation.
 """
 
@@ -10 +10 @@
     roles = member.getRoles()
     if 'Manager' in roles:
-        return context.folder_view()
+        return context.accommodation_view_manager(psm=psm)
     elif 'StudentManager' in roles:
         return context.accommodation_view_manager(psm=psm)

waeup_product/trunk/skins/waeup_student/accommodation_view_all.pt

@@ -12 +12 @@
              tal:define="items here/contentValues"
              >
-    <h2><span tal:content="context/id" /></h2>
+    <h2>Accomodation</h2>
     <table cellspacing="0" cellpadding="0">
       <tal:block condition="python: len(items)">
@@ -19 +19 @@
             <a href="jamb" 
                tal:attributes="href item/absolute_url"
-               tal:content="item/title_or_id"></a>
+               tal:content="item/heading"></a>
           </td>
         </tr>

waeup_product/trunk/skins/waeup_student/accommodation_view_manager.pt

@@ -12 +12 @@
              tal:define="items here/contentValues"
              >
-    <h2><span tal:content="context/id" /></h2>
+    <h2>Accomodation</h2>
     <table cellspacing="0" cellpadding="0">
       <tal:block condition="python: len(items)">
@@ -19 +19 @@
             <a href="jamb" 
                tal:attributes="href item/absolute_url"
-               tal:content="item/title_or_id"></a>
+               tal:content="item/heading"></a>
           </td>
         </tr>

waeup_product/trunk/skins/waeup_student/accommodation_view_student.pt

@@ -12 +12 @@
              tal:define="items here/contentValues"
              >
-    <h2><span tal:content="context/title_or_id" /></h2>
+    <h2>Accomodation</h2>
     <table cellspacing="0" cellpadding="0">
       <tal:block condition="python: len(items)">
@@ -19 +19 @@
             <a href="jamb" 
                tal:attributes="href item/absolute_url"
-               tal:content="item/title_or_id"></a>
+               tal:content="item/heading"></a>
           </td>
         </tr>

waeup_product/trunk/skins/waeup_student/add_accommodation.py

@@ -16 +16 @@
 lt = context.portal_layouts
 
-accofolder = getattr(context,"Accommodation",None)
-if accofolder is None:
-    context.invokeFactory('AccoFolder','Accommodation')
-    accofolder = getattr(context,"Accommodation")
-    context.notifyCPSDocumentCreation(ob=accofolder)
-    
-    
 res,psm,ds = lt.renderLayout(layout_id= 'accommodation',
                       schema_id = 'accommodation',
@@ -45 +38 @@
 elif psm == 'valid':
     oid = "%s" % ds.get('heading').replace(' ','')
-    accofolder.invokeFactory(type_name,oid) 
-    object = getattr(accofolder,oid)    
+    context.invokeFactory(type_name,oid)
+    object = getattr(context,oid)
     object.getContent().edit(mapping=ds)
     context.notifyCPSDocumentCreation(ob=object)
     psm = 'new %s created' % oid
-    context_ti = context.portal_types[context.portal_type] 
+    context_ti = context.portal_types[context.portal_type]
     index = context_ti.getActionById('view','university_view')
     return getattr(context,index)(psm=psm)