Changeset 739

Timestamp:

21 Oct 2006, 13:37:37 (18 years ago)

Author:

Henrik Bettermann

Message:

academics_document_view.pt renamed and moved

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/types/StudentAccommodation.xml (modified) (3 diffs)
• profiles/default/types/StudentApplication.xml (modified) (2 diffs)
• profiles/default/types/StudentClearance.xml (modified) (2 diffs)
• profiles/default/types/StudentCourseResult.xml (modified) (2 diffs)
• profiles/default/types/StudentPersonal.xml (modified) (2 diffs)
• profiles/default/types/StudentSemester.xml (modified) (1 diff)
• skins/waeup_academics/academics_document_view.pt (deleted)
• skins/waeup_academics/academics_index.py (modified) (2 diffs)
• skins/waeup_default/waeup_document_view.pt (added)
• skins/waeup_student/getStudentInfo.py (modified) (3 diffs)

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

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addStudentAccommodation</property>
- <property name="immediate_view">academics_document_view</property>
+ <property name="immediate_view">waeup_document_view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -26 +26 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_document_view"/>
- <alias from="view" to="academics_document_view"/>
+ <alias from="(Default)" to="waeup_document_view"/>
+ <alias from="view" to="waeup_document_view"/>
  <action title="View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/academics_document_view"
+    condition_expr="" url_expr="string:${object_url}/waeup_document_view"
     visible="True">
   <permission value="View"/>
@@ -37 +37 @@
     visible="True">
   <permission value="Modify portal content"/>
- </action> 
+ </action>
 </object>

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

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addStudentApplication</property>
- <property name="immediate_view">academics_document_view</property>
+ <property name="immediate_view">waeup_document_view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -26 +26 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_document_view"/>
- <alias from="view" to="academics_document_view"/>
+ <alias from="(Default)" to="waeup_document_view"/>
+ <alias from="view" to="waeup_document_view"/>
  <action title="View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/academics_document_view"
+    condition_expr="" url_expr="string:${object_url}/waeup_document_view"
     visible="True">
   <permission value="View"/>

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

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addStudentClearance</property>
- <property name="immediate_view">academics_document_view</property>
+ <property name="immediate_view">waeup_document_view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -28 +28 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_document_view"/>
+ <alias from="(Default)" to="waeup_document_view"/>
  <alias from="view" to="academics_contents"/>
  <action title="View" action_id="view" category="object"
     condition_expr=""
-    url_expr="string:${object_url}/academics_document_view"
+    url_expr="string:${object_url}/waeup_document_view"
     visible="True">
   <permission value="View"/>

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

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addStudentCourseResult</property>
- <property name="immediate_view">academics_document_view</property>
+ <property name="immediate_view">waeup_document_view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -26 +26 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_document_view"/>
+ <alias from="(Default)" to="waeup_document_view"/>
  <alias from="create_do" to="waeup_document_create_do"/>
  <alias from="created" to="student_course_result_created"/>
- <alias from="view" to="academics_document_view"/>
+ <alias from="view" to="waeup_document_view"/>
  <action title="View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/academics_document_view"
+    condition_expr="" url_expr="string:${object_url}/waeup_document_view"
     visible="True">
   <permission value="View"/>

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

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addStudentPersonal</property>
- <property name="immediate_view">academics_document_view</property>
+ <property name="immediate_view">waeup_document_view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -28 +28 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_document_view"/>
- <alias from="view" to="academics_document_view"/>
+ <alias from="(Default)" to="waeup_document_view"/>
+ <alias from="view" to="waeup_document_view"/>
  <action title="View" action_id="view" category="object"
     condition_expr=""
-    url_expr="string:${object_url}/academics_document_view"
+    url_expr="string:${object_url}/waeup_document_view"
     visible="True">
   <permission value="View"/>

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

@@ -28 +28 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_document_view"/>
- <alias from="view" to="academics_document_view"/>
+ <alias from="(Default)" to="waeup_document_view"/>
+ <alias from="view" to="waeup_document_view"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_document_view" visible="True">
+    url_expr="string:${object_url}/waeup_document_view" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/skins/waeup_academics/academics_index.py

@@ -29 +29 @@
         return context.courses_view()
     elif context.portal_type == 'CertificatesFolder':
-        return context.certificates_view()        
+        return context.certificates_view()
     elif context.portal_type == 'Certificate':
         return context.certificate_view()
@@ -35 +35 @@
         return context.level_view()
     elif context.portal_type in ('CertificateCourse','Course'):
-        return context.academics_document_view()
+        return context.waeup_document_view()
     return redirect("%s/srp_manager_view" % context.portal_url())
 

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -25 +25 @@
 member_id = str(member)
 if student is None:
-    if context.isManager():
+    if context.isManager() and 'students' in context.getPhysicalPath():
         if context.portal_type == 'Student':
             student_id = context.getId()
@@ -31 +31 @@
             student_id = context.aq_parent.getId()
         elif context.aq_parent.aq_parent.portal_type == 'Student':
-            student_id = context.aq_parent.aq_parent.getId()    
+            student_id = context.aq_parent.aq_parent.getId()
         elif context.aq_parent.aq_parent.aq_parent.portal_type == 'Student':
-            student_id = context.aq_parent.aq_parent.aq_parent.getId()   
+            student_id = context.aq_parent.aq_parent.aq_parent.getId()
         else:
-            student_id = member_id            
+            student_id = member_id
     else:
         student_id = member_id
@@ -87 +87 @@
     row['type'] = so.portal_type
     row['is_editable'] = mtool.checkPermission('Modify portal content', soo)
-    sv_link = s_view_links.get(so.portal_type,None) or "academics_document_view"
+    sv_link = s_view_links.get(so.portal_type,None) or "waeup_document_view"
     row['s_view_link'] = "%s/%s" % (soo.absolute_url(),sv_link)
     se_link = s_edit_links.get(so.portal_type,None)