Changeset 888

Timestamp:

17 Nov 2006, 21:28:48 (18 years ago)

Author:

Henrik Bettermann

Message:

some fixes according to email
portlet_waeup_status_display now displays also student state

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/themes/WAeUP_Backoffice/Default/main/cell_sizer1.xml (modified) (1 diff)
• skins/waeup_default/isManager.py (modified) (1 diff)
• skins/waeup_default/portlet_waeup_status_display.pt (modified) (1 diff)
• skins/waeup_student/clearance_edit_form.pt (modified) (1 diff)
• skins/waeup_student/clearance_edit_form_manager.pt (modified) (1 diff)
• skins/waeup_student/clearance_edit_lib.pt (modified) (1 diff)
• skins/waeup_student/student_index.py (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/themes/WAeUP_Backoffice/Default/main/cell_sizer1.xml

@@ -2 +2 @@
 <object name="cell_sizer1" meta_type="Cell Sizer">
  <property name="xpos">3</property>
- <property name="cellwidth">165px</property>
+ <property name="cellwidth">280px</property>
 </object>

WAeUP_SRP/trunk/skins/waeup_default/isManager.py

@@ -12 +12 @@
 mtool = context.portal_membership
 roles = mtool.getAuthenticatedMember().getRolesInContext(context)
-return "Manager" in roles
+return "SectionManager" in roles or\
+       "Manager" in roles

WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt

@@ +1 @@
+<metal:block define-macro="status_display">
 <tal:block define="item nocall:options/context_obj;
-                   info item/getContentInfo;
+                   item_info item/getContentInfo;
+                   student_info item/getStudentInfo;
                    base_url python: request.get('cpsskins_base_url');
-                   status_list python: ['checked', 'unchecked', 'opened', 'closed', 
-                                        'created', 'student_created', 'application_pin_entered', 
-                                        'admission_applied',
-                                        'cleared_and_validated',
-                                        'pume_passed',
-                                        'pume_failed',
-                                        'admitted',
-                                        'deferred',
-                                        'objection_raised',
-                                        'admission_rejected',
-                                        'finally_rejected',
-                                        'clearance_pin_entered',
-                                        'category_A',
-                                        'category_B',
-                                        'category_C',
-                                        'category_D',
-                                        'category_E',
-                                        'category_F',
-                                        'content_addable',
-                                        'bed_reserved',
-                                        'maintenance_fee_paid'];">
+                   states_not_shown python: ('work',);">
 
-<span tal:condition="python:path('info/review_state') in status_list ">
-  <span tal:content="info/review_state" />
-</ span>
 
+<span tal:condition="python:path('item_info/review_state') not in states_not_shown ">                   
+                   
+  <span tal:condition="student_info">
+    <span tal:content="student_info/review_state" />  
+    <span tal:condition="python:item_info['review_state']!=student_info['review_state']"> 
+       / <span tal:content="item_info/review_state" />
+    </span>
+  </ span>
+
+  <span tal:condition="not: student_info">
+    <span tal:content="item_info/review_state" />
+  </span>
+
+</span>
 </tal:block>
+</metal:block>
 
+

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form.pt

@@ -4 +4 @@
            isStaff context/isStaff;
            isClearanceOfficer context/isClearanceOfficer;
-           isOwner context/isThisStudent;
+           isOwner context/isStudent;
            review_state info/review_state;
            edition python: (isOwner and review_state == 'clearance_pin_entered' or isManager) and not isClearanceOfficer;

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form_manager.pt

@@ -4 +4 @@
            isStaff context/isStaff;
            isClearanceOfficer context/isClearanceOfficer;
-           isOwner context/isThisStudent;
+           isOwner context/isStudent;
            edition python:(isOwner or isManager) and not isClearanceOfficer;
            mode python: test(edition,'edit','view');

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_lib.pt

@@ -55 +55 @@
            value="Reject Clearance" 
            id="reject_clearance_button"
-           tal:condition="python:review_state == 'cleared_and_validated'" />
+           tal:condition="python:review_state in ('cleared_and_validated','clearance_requested',)" />
   </tal:block>
   <!--  isClearanceOfficer -->

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -19 +19 @@
 if pm.isAnonymousUser():
     return redirect("%s/srp_anonymous_view" % context.absolute_url())
-if context.isManager():
+if context.isManager() or context.isStaff:
     if context.portal_type == 'StudentStudyCourse':
         return context.study_course_view()