Changeset 15502
- Timestamp:
- 19 Jul 2019, 05:58:55 (5 years ago)
- Location:
- main/waeup.kofa/trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.kofa/trunk/CHANGES.txt
r15476 r15502 4 4 1.6.1.dev0 (unreleased) 5 5 ======================= 6 7 * Add passport picture switch to applicants containers. 6 8 7 9 * Use decimal.Decimal to counteract Python floating point limitation. -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py
r15122 r15502 1171 1171 1172 1172 def dataNotComplete(self): 1173 store = getUtility(IExtFileStore) 1174 if not store.getFileByContext(self.context, attr=u'passport.jpg'): 1175 return _('No passport picture uploaded.') 1176 if not self.request.form.get('confirm_passport', False): 1177 return _('Passport picture confirmation box not ticked.') 1173 if self.context.__parent__.with_picture: 1174 store = getUtility(IExtFileStore) 1175 if not store.getFileByContext(self.context, attr=u'passport.jpg'): 1176 return _('No passport picture uploaded.') 1177 if not self.request.form.get('confirm_passport', False): 1178 return _('Passport picture confirmation box not ticked.') 1178 1179 return False 1179 1180 -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantdisplaypage.pt
r15130 r15502 15 15 </div> 16 16 17 <img src="" height="180px" tal:attributes="src view/passport_url" /> 17 <img tal:condition="python: context.__parent__.with_picture" 18 src="" height="180px" tal:attributes="src view/passport_url" /> 18 19 19 20 <table i18n:domain="waeup.kofa" class="form-table"> -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicanteditpage.pt
r15130 r15502 22 22 <tbody> 23 23 <tal:widgets content="structure provider:widgets" /> 24 <tr >24 <tr tal:condition="python: context.__parent__.with_picture"> 25 25 <td class="fieldname" i18n:translate=""> 26 26 Passport Photo: … … 69 69 </table> 70 70 71 <div tal:condition="not: view/manage_applications"> 71 <div tal:condition="python: not view.manage_applications 72 and context.__parent__.with_picture"> 72 73 <input id="confirm_passport" name="confirm_passport" 73 74 type="checkbox" value="True"/> -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py
r15188 r15502 290 290 ) 291 291 292 with_picture= schema.Bool( 293 title = _(u'With passport picture'), 294 required = False, 295 default = True, 296 ) 297 292 298 def addApplicant(applicant): 293 299 """Add an applicant. -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py
r13968 r15502 72 72 self.assertEqual( 73 73 result, 74 'application_category,application_fee,application_slip_notice,code,description,' 75 'enddate,hidden,mode,prefix,startdate,strict_deadline,title,year\r\n' 74 'application_category,application_fee,application_slip_notice,code,' 75 'description,enddate,hidden,mode,prefix,startdate,' 76 'strict_deadline,title,with_picture,year\r\n' 76 77 77 78 'basic,0.0,,dp2015,' 78 79 '"Some Description\nwith linebreak\n<<de>>man spriht deutsh",' 79 80 '2015-01-31 23:00:00+00:00#,0,,app,2015-01-01 12:00:00+00:00#,1,' 80 'General Studies, 2015\r\n'81 'General Studies,1,2015\r\n' 81 82 ) 82 83 return
Note: See TracChangeset for help on using the changeset viewer.