Changeset 867 for WAeUP_SRP/trunk

Timestamp:

14 Nov 2006, 16:15:38 (18 years ago)

Author:

joachim

Message:

patch for default field width in stringWidgets
isClearanceOfficer added

Location:

WAeUP_SRP/trunk

Files:

• PatchBasicWidgetsCPSStringWidget.py (added)
• __init__.py (modified) (1 diff)
• profiles/default/rolemap.xml (modified) (1 diff)
• skins/waeup_custom/getCPSCandidateLocalRoles.py (modified) (1 diff)
• skins/waeup_default/waeup_edit_buttons.pt (modified) (2 props)
• skins/waeup_default/waeup_edit_form.pt (modified) (1 prop)
• skins/waeup_student/getStudentInfo.py (modified) (3 diffs)
• skins/waeup_student/isClearanceOfficer.py (added)

WAeUP_SRP/trunk/__init__.py

@@ -14 +14 @@
 import PatchCatalogToolXMLAdapter
 import PatchCPSSchemasAttributeStorageAdapter
+import PatchBasicWidgetsCPSStringWidget
 # Only for CPS 3.4.1. In 3.4.2 and later this should be fixed.
 import PatchCPSDefaultImportExport

WAeUP_SRP/trunk/profiles/default/rolemap.xml

@@ -3 +3 @@
   <roles>
     <role name="Staff"/>
-    <role name="ClearanceManager"/>
+    <role name="ClearanceOfficer"/>
     <role name="Student"/>
     <role name="SectionReader"/>

WAeUP_SRP/trunk/skins/waeup_custom/getCPSCandidateLocalRoles.py

@@ -18 +18 @@
 mtool = getToolByName(context, 'portal_membership')
 #return mtool.getCPSCandidateLocalRoles(context)
-return ['SectionReader','SectionManager','ClearanceManager']
+return ['SectionReader','SectionManager','ClearanceOfficer']

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -53 +53 @@
 info['per_doc'] = student.personal.getContent()
 course = getattr(student,'study_course',None)
+#
 info['course'] = course
 if course:
@@ -59 +60 @@
 if info['per_doc'].sex:
     info['sex'] = 'female'
-##res = context.portal_catalog(container_path=student_path,
-##                             portal_type='StudentAccommodation')
-##if res:
-##    acco = res[0].getObject()
+#
 acco = getattr(student,'accommodation_2006',None)
-#if acco.portal_type != "StudentAccommodation":
-#    acco = None
 info['acco'] = acco
 if acco is not None:
     info['acco_doc'] = acco.getContent()
     info['acco_review_state'] = wf.getInfoFor(acco,'review_state',None)
-##res = context.portal_catalog(container_path=student_path,
-##                             portal_type='StudentClearance')
-##if res:
-##    clear = res[0].getObject()
-##    info['clear'] = clear
+#
 clear = getattr(student,'clearance',None)
 info['clear'] = clear
@@ -80 +72 @@
     info['clear_doc'] = clear.getContent()
     info['clear_review_state'] = wf.getInfoFor(clear,'review_state',None)
-
-##res = context.portal_catalog(container_path=student_path,
-##                             portal_type='StudentPume')
-##if res:
-##    pume = res[0].getObject()
-##    info['pume'] = clear
+#
 pume = getattr(student,'pume',None)
 info['pume'] = pume