Changeset 672 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

12 Oct 2006, 18:23:28 (18 years ago)

Author:

joachim

Message:

several simplifications to student_index, student_edit must be called instead of passport_entry_view

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getStudentInfo.py (modified) (2 diffs)
• layout_application_edit.pt (modified) (2 diffs)
• passport_entry_view.pt (modified) (1 diff)
• student_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -62 +62 @@
 
 items = []
+s_edit_links = {'StudentApplication': 'student_edit',
+              'StudentAccommodation': '',
+              'StudentPersonal': '',
+              }
 sos = context.portal_catalog(container_path=student_path)
 for so in sos:
@@ -72 +76 @@
     row['type'] = so.portal_type
     row['is_editable'] = mtool.checkPermission('Modify portal content', soo)
+    row['s_edit_link'] = "%s/%s" % (student.absolute_url(),s_edit_links[so.portal_type])
     row['review_state'] = so.review_state
+    row['display'] = so.review_state in ('opened','closed')
     items.append(row)
 info['items'] = items

WAeUP_SRP/trunk/skins/waeup_student/layout_application_edit.pt

@@ -15 +15 @@
   widgets python:context.getRenderedWidgets(layout);
   ">
-  <span tal:condition="python: 0" tal:replace="structure widgets" />
   <form action="" id="editForm" method="post" 
         enctype="multipart/form-data" class="workflow"
         tal:attributes="action formaction"
-        
         >
   <table class="layoutDefault" summary="Form layout"
@@ -71 +69 @@
       </span>
     </span>
-    <tr tal:condition="widgets/passport|nothing" tal:define="cell widgets/passport|nothing;">
+    <tr tal:condition="widgets/passport|nothing" 
+        tal:define="cell widgets/passport|nothing;">
       <tal:block tal:define="widget cell/widget;
       wid widget/getWidgetId;

WAeUP_SRP/trunk/skins/waeup_student/passport_entry_view.pt

@@ -15 +15 @@
               tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
               layout_mode='edit', 
-              layout_id='student_application_fe')" 
+              layout_id='student_application_fe',
+              )" 
               />
       </span>

WAeUP_SRP/trunk/skins/waeup_student/student_view.pt

@@ -38 +38 @@
         <table tal:condition="is_student" class="contentListing" width="100%" summary="content layout" id="folder_content">      
           <span tal:repeat="row rows">
-          <tr tal:condition="python:row['type'] == 'StudentApplication' and row['review_state'] in ['opened', 'closed']"
+          <tr tal:condition="row/display"
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
             <td><a href="view" tal:attributes="href string:${row/url}/application_view">
@@ -44 +44 @@
             <td> 
             <a tal:condition="row/is_editable"
-                href="edit" tal:attributes="href string:${info/url}/passport_entry_view">
+                href="edit" tal:attributes="href string:${row/s_edit_link}">
                 [edit]
             </a>