Changeset 1796

Timestamp:

18 May 2007, 10:52:31 (18 years ago)

Author:

Henrik Bettermann

Message:

some fixes to display the correct object actions
also one fix regarding ticket #214

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/cps_portlets/portlet_object_actions_staff.xml (modified) (1 diff)
• profiles/default/cps_portlets/portlet_object_actions_students.xml (modified) (1 diff)
• profiles/default/vocabularies.xml (modified) (1 diff)
• skins/waeup_design/main_template.pt (modified) (1 diff)
• skins/waeup_directory/getWAeUPDirectoryActions.py (modified) (1 diff)
• skins/waeup_directory/member_view.pt (modified) (3 diffs)
• skins/waeup_student/display_session_results.py (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/cps_portlets/portlet_object_actions_staff.xml

@@ -45 +45 @@
  <f id="provider" v=""/>
  <f id="show_icons" v="True"/>
- <f id="slot" v="staff_object_tabs"/>
+ <f id="slot" v="staff_object_slot"/>
  <f id="slot_override" v="0"/>
  <f id="visibility_range" v="0-0"/>

WAeUP_SRP/trunk/profiles/default/cps_portlets/portlet_object_actions_students.xml

@@ -37 +37 @@
  <f id="provider" v=""/>
  <f id="show_icons" v="True"/>
- <f id="slot" v="student_object_tabs"/>
+ <f id="slot" v="student_object_slot"/>
  <f id="slot_override" v="0"/>
  <f id="visibility_range" v="0-0"/>

WAeUP_SRP/trunk/profiles/default/vocabularies.xml

@@ -36 +36 @@
  <object name="searchable_academics_states" meta_type="CPS Vocabulary"/>
  <object name="verdicts" meta_type="CPS Vocabulary"/>
+ <object name="global_roles" meta_type="CPS Vocabulary"/>
  </object>

WAeUP_SRP/trunk/skins/waeup_design/main_template.pt

@@ -26 +26 @@
   student_theme python:test(waeup_skin == 'WAeUP_Student',1,0);
   navigation_slot python:test(student_theme,'student_navigation_slot','navigation_slot');
-  object_tabs python:test(student_theme,'student_object_tabs','staff_object_tabs');
+  object_tabs python:test(student_theme,'student_object_slot','staff_object_slot');
   
   ">

WAeUP_SRP/trunk/skins/waeup_directory/getWAeUPDirectoryActions.py

@@ -45 +45 @@
     'name': 'cpsdir_label_edit_entry',
     'category': 'object',
+    'available': True,
+    'visible': True,
+    'allowed': True,
+    'permissions': ('View',), 
     }
 

WAeUP_SRP/trunk/skins/waeup_directory/member_view.pt

@@ -7 +7 @@
 <metal:block use-macro="here/main_template/macros/master">
 
-  <metal:block fill-slot="style_slot">
+  <metal:block fill-slot="head_slot">
     <tal:block define="global actions
-      python:context.getWAeUPDirectoryActions(actions, dirname, dir, 'view', id)"/>
+      python:context.getWAeUPDirectoryActions(actions, dirname, dir, 'view', id)"/>    
+  </metal:block>
+
+  <metal:block fill-slot="style_slot">  
     <link rel="Stylesheet" type="text/css" href=""
       tal:attributes="href string:${base_url}document.css" />
@@ -17 +20 @@
 
   <metal:block fill-slot="main" tal:define="
-    
-    res python: dir.renderEntryDetailed(id);
-    global rendered_main python: res[0];
-    ds python: res[1];
-    global title ds/?title_field|id;">
+                                res python: dir.renderEntryDetailed(id);
+                                global rendered_main python: res[0];
+                                ds python: res[1];
+                                global title ds/?title_field|id;">
     
     <h3>
@@ -27 +29 @@
     </h3>
 
-
+    
     <div tal:replace="structure rendered_main">Rendered main...</div>
     <input type="submit" name="back" i18n:attributes="value"

WAeUP_SRP/trunk/skins/waeup_student/display_session_results.py

@@ -81 +81 @@
 if res:
     student_id = res[0].id
-    student_obj = getattr(context.portal_url.getPortalObject().campus.students,student_id,None)
+
+    #There was one student with empty id in returning_import (BMS0406035)
+    student_obj = None
+    if student_id:
+        student_obj = getattr(context.portal_url.getPortalObject().campus.students,student_id,None)
+    else:
+        registered = ' '
+
     if student_obj and hasattr(student_obj,'application'):
         registered = student_id