Changeset 12664 for main/waeup.kofa/trunk
- Timestamp:
- 5 Mar 2015, 09:01:43 (10 years ago)
- Location:
- main/waeup.kofa/trunk/src/waeup/kofa/applicants
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py
r12395 r12664 808 808 manage_applications = True 809 809 pnav = 3 810 display_actions = [[_('Save'), _('Final Submit')],810 display_actions = [[_('Save'), _('Finally Submit')], 811 811 [_('Add online payment ticket'),_('Remove selected tickets')]] 812 812 … … 993 993 [_('Add online payment ticket'),_('Remove selected tickets')]] 994 994 elif self.context.special and state == PAID: 995 actions = [[_('Save'), _('Final Submit')],995 actions = [[_('Save'), _('Finally Submit')], 996 996 [_('Add online payment ticket'),_('Remove selected tickets')]] 997 997 elif state == PAID: 998 actions = [[_('Save'), _('Final Submit')],998 actions = [[_('Save'), _('Finally Submit')], 999 999 [_('Remove selected tickets')]] 1000 1000 return actions … … 1054 1054 return 1055 1055 1056 @action(_('Final Submit'), warning=WARNING)1056 @action(_('Finally Submit'), warning=WARNING) 1057 1057 def finalsubmit(self, **data): 1058 1058 if self.upload_success is False: # False is not None! -
main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py
r12395 r12664 916 916 file_ctrl.add_file(image, filename='myphoto.jpg') 917 917 self.browser.getControl(name="confirm_passport").value = True 918 self.browser.getControl("Final Submit").click()918 self.browser.getControl("Finally Submit").click() 919 919 self.browser.open(self.view_path + '/' + payment_id) 920 920 self.browser.getLink("Download payment slip").click() … … 1042 1042 file_ctrl.add_file(image, filename='myphoto.jpg') 1043 1043 self.browser.getControl(name="confirm_passport").value = True 1044 self.browser.getControl("Final Submit").click()1044 self.browser.getControl("Finally Submit").click() 1045 1045 self.browser.open(applicant_path + '/' + payment_id) 1046 1046 self.browser.getLink("Download payment slip").click() … … 1068 1068 self.login() 1069 1069 self.browser.getLink("Edit application record").click() 1070 self.assertFalse('Final Submit' in self.browser.contents)1070 self.assertFalse('Finally Submit' in self.browser.contents) 1071 1071 IWorkflowInfo(self.applicant).fireTransition('pay') 1072 1072 self.browser.open(self.edit_path) 1073 self.assertTrue('Final Submit' in self.browser.contents)1073 self.assertTrue('Finally Submit' in self.browser.contents) 1074 1074 self.fill_correct_values() # fill other fields with correct values 1075 1075 self.browser.getControl("Save").click() 1076 self.browser.getControl("Final Submit").click()1076 self.browser.getControl("Finally Submit").click() 1077 1077 # We forgot to upload a passport picture 1078 1078 self.assertTrue( … … 1083 1083 file_ctrl = ctrl.mech_control 1084 1084 file_ctrl.add_file(image, filename='myphoto.jpg') 1085 self.browser.getControl("Final Submit").click() # (finally) submit form1085 self.browser.getControl("Finally Submit").click() # (finally) submit form 1086 1086 # The picture has been uploaded but the form cannot be submitted 1087 1087 # since the passport confirmation box was not ticked … … 1105 1105 self.browser.open(self.edit_path) 1106 1106 self.browser.getControl(name="confirm_passport").value = True 1107 self.browser.getControl("Final Submit").click()1107 self.browser.getControl("Finally Submit").click() 1108 1108 self.assertTrue( 1109 1109 'Application submitted' in self.browser.contents) … … 1114 1114 self.browser.open(self.edit_path) 1115 1115 self.browser.getControl(name="confirm_passport").value = True 1116 self.browser.getControl("Final Submit").click()1116 self.browser.getControl("Finally Submit").click() 1117 1117 self.assertTrue( 1118 1118 'Application submitted' in self.browser.contents) … … 1124 1124 'The requested form is locked' in self.browser.contents) 1125 1125 self.browser.goBack(count=1) 1126 self.browser.getControl("Final Submit").click()1126 self.browser.getControl("Finally Submit").click() 1127 1127 self.assertTrue( 1128 1128 'The requested form is locked' in self.browser.contents)
Note: See TracChangeset for help on using the changeset viewer.