Changeset 891 for WAeUP_SRP/trunk/skins
- Timestamp:
- 18 Nov 2006, 20:59:12 (18 years ago)
- Location:
- WAeUP_SRP/trunk/skins
- Files:
-
- 3 added
- 3 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
WAeUP_SRP/trunk/skins/waeup_custom/cpsdocument_edit.py
r873 r891 38 38 is_valid, ds = doc.validate(request=REQUEST, proxy=context, cluster=cluster, 39 39 use_session=True) 40 args = {} 40 41 41 42 if action is None: … … 50 51 action = '' 51 52 psm = 'psm_content_changed' 52 args = {} 53 53 54 else: 54 55 psm = 'psm_content_error' -
WAeUP_SRP/trunk/skins/waeup_default/contact_admin_form.pt
r890 r891 29 29 </td> 30 30 <td> 31 <textarea name=" commt" rows="10" cols="60" id="commt"></textarea>31 <textarea name="descr" rows="10" cols="60" id="descr"></textarea> 32 32 </td> 33 33 </tr> -
WAeUP_SRP/trunk/skins/waeup_default/mail2admin.py
r869 r891 18 18 From: %s <%s> 19 19 To: %s 20 Cc: %s 20 21 Bcc: %s 21 22 Reply-To: %s … … 34 35 email, 35 36 prop.email_from_address, 37 email, 36 38 'henrik@waeup.org', 37 39 # 'js@aixtraware.de', -
WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py
r885 r891 34 34 clear = info['clear'] 35 35 clear_doc = info['clear_doc'] 36 review_state = info['review_state']37 36 38 37 is_valid, ds = clear_doc.validate(request=REQUEST, … … 47 46 if is_valid: 48 47 if cpsdocument_edit_button: 49 psm = 'Content changed.'48 psm = "Content changed!" 50 49 elif cpsdocument_edit_and_view_button: 51 50 wftool.doActionFor(info['clear'],'close') 52 51 wftool.doActionFor(info['student'],'request_clearance',dest_container=1) 52 psm = "You successfully requested clearance!" 53 53 elif clear_and_validate_button: 54 54 wftool.doActionFor(info['student'],'clear_and_validate') 55 psm = "Clearance and eligibility record is validated and and student is cleared!" 55 56 elif reject_clearance_button: 56 57 wftool.doActionFor(info['clear'],'open') 57 58 wftool.doActionFor(info['student'],'reject_clearance') 59 action = "/contact_student_form" 60 psm = "Student's clearance request has been rejected! Please fill and submit the form below!" 58 61 else: 59 psm = "Please correct your errors." 60 args = getFormUidUrlArg(REQUEST) 61 args['review_state'] = review_state 62 psm = "Please correct your errors!" 63 args = getFormUidUrlArg(REQUEST) 64 65 66 62 67 args['portal_status_message'] = psm 63 if args: 64 url = clear.absolute_url() + action + '?' + urlencode(args) 65 else: 66 url = clear.absolute_url() + action 68 url = clear.absolute_url() + action + '?' + urlencode(args) 67 69 REQUEST.RESPONSE.redirect(url) -
WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_lib.pt
r889 r891 68 68 value="Reject Clearance" 69 69 id="reject_clearance_button" 70 tal:condition="python:review_state == 'cleared_and_validated'" />70 tal:condition="python:review_state in ('cleared_and_validated','clearance_requested',)" /> 71 71 </tal:block> 72 72 <!-- isStudent --> -
WAeUP_SRP/trunk/skins/waeup_student/clearance_view.pt
r840 r891 2 2 is_manager info/is_manager|nothing; 3 3 is_student info/is_student|nothing; 4 s_info context/getStudentInfo;">4 "> 5 5 <metal:body use-macro="here/waeup_content_master/macros/master"> 6 6 <metal:main fill-slot="main"> … … 22 22 23 23 <h3> 24 <span tal:condition="python:is_manager and s_info">25 <span tal:content=" s_info/student/Title" />:24 <span tal:condition="python:is_manager and info"> 25 <span tal:content="info/student/Title" />: 26 26 </span> 27 27 <span tal:condition="python:is_student"> -
WAeUP_SRP/trunk/skins/waeup_student/raise_objection.py
r863 r891 24 24 info['app_doc'].edit(mapping={'objection_date':current,}) 25 25 wf.doActionFor(info['student'],'raise_objection') 26 return context.objection_raised_ view(info=info)26 return context.objection_raised_form(info=info) -
WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py
r887 r891 171 171 info = context.getStudentInfo(item) 172 172 students.append(info) 173 173 174 174 return context.students_manager_view(rendered = rend, 175 175 psm = "", … … 182 182 ) 183 183 return context.students_manager_view(rendered = rend, 184 psm = """Step: %s found: %s Your search for "%s" in %s with state %s failed.<br\>%s""" % (query_step,len(items),st,what,state,bools), 184 psm = "No student found!", 185 #psm = """Step: %s found: %s Your search for "%s" in %s with state %s failed.<br\>%s""" % (query_step,len(items),st,what,state,bools), 185 186 students = students, 186 187 allowed = True, -
WAeUP_SRP/trunk/skins/waeup_student/student_index.py
r888 r891 1 ## Script (Python) "student_index t"1 ## Script (Python) "student_index" 2 2 ##bind container=container 3 3 ##bind context=context … … 25 25 return context.study_level_view() 26 26 elif context.portal_type == 'StudentClearance': 27 return context.clearance_ view()27 return context.clearance_edit_form() 28 28 elif context.portal_type == 'Student': 29 29 return redirect("%s/student_view" % context.absolute_url()) … … 32 32 info = context.getStudentInfo() 33 33 student = info['student'] 34 #doc = info['app_doc']35 #state = context.getStudentInfo()['review_state']36 #if state == 'admission_applied':37 # return redirect("%s/application_view" % student.absolute_url())38 #elif state in ('application_pin_entered',):39 # return redirect("%s/application_edit" % info['app'].absolute_url())40 #elif state in ('admitted',):41 # return redirect("%s/admission_form" % student.absolute_url())42 #elif state == 'clearance_pin_entered':43 # return redirect("%s/student_view" % info['clear'].absolute_url())44 #elif context.portal_type == 'StudentStudyLevel':45 # return context.study_level_student_view()46 34 return redirect("%s/student_view" % student.absolute_url()) -
WAeUP_SRP/trunk/skins/waeup_student/students_manager_view.pt
r887 r891 64 64 <td><span tal:replace="python: student['app_doc'].jamb_reg_no" /></td> 65 65 <td tal:condition="options/co_view|nothing"><a href="id" 66 tal:attributes="href string:${student/student/clearance/absolute_url}/clearance_edit_form _manager"66 tal:attributes="href string:${student/student/clearance/absolute_url}/clearance_edit_form" 67 67 tal:content="student/review_state"></a></td> 68 68 <td tal:condition="not: options/co_view|nothing"><span tal:replace="student/review_state" /></td>
Note: See TracChangeset for help on using the changeset viewer.