From 2486158c12dcfc7b0b79eacd47a0c0d1cada0f57 Mon Sep 17 00:00:00 2001 From: diminator Date: Mon, 21 Sep 2015 10:47:24 +0200 Subject: [PATCH 1/2] .required => .isRequired --- js/components/ascribe_forms/form_loan_request_answer.js | 2 +- js/components/ascribe_settings/account_settings.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/components/ascribe_forms/form_loan_request_answer.js b/js/components/ascribe_forms/form_loan_request_answer.js index 2ebdb439..1bfe90db 100644 --- a/js/components/ascribe_forms/form_loan_request_answer.js +++ b/js/components/ascribe_forms/form_loan_request_answer.js @@ -18,7 +18,7 @@ let LoanRequestAnswerForm = React.createClass({ url: React.PropTypes.string, id: React.PropTypes.object, message: React.PropTypes.string, - handleSuccess: React.PropTypes.func.required + handleSuccess: React.PropTypes.func.isRequired }, getDefaultProps() { diff --git a/js/components/ascribe_settings/account_settings.js b/js/components/ascribe_settings/account_settings.js index aa50d719..7c769c22 100644 --- a/js/components/ascribe_settings/account_settings.js +++ b/js/components/ascribe_settings/account_settings.js @@ -19,8 +19,8 @@ import { getLangText } from '../../utils/lang_utils'; let AccountSettings = React.createClass({ propTypes: { - currentUser: React.PropTypes.object.required, - loadUser: React.PropTypes.func.required + currentUser: React.PropTypes.object.isRequired, + loadUser: React.PropTypes.func.isRequired }, handleSuccess(){ From ec0208358d0a8933b2f5681a5e2cfb3d99d7c9a5 Mon Sep 17 00:00:00 2001 From: diminator Date: Mon, 21 Sep 2015 10:54:13 +0200 Subject: [PATCH 2/2] added appendix --- js/components/ascribe_forms/form_loan.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/js/components/ascribe_forms/form_loan.js b/js/components/ascribe_forms/form_loan.js index 6aef1f56..aeb942ee 100644 --- a/js/components/ascribe_forms/form_loan.js +++ b/js/components/ascribe_forms/form_loan.js @@ -152,6 +152,23 @@ let LoanForm = React.createClass({ } }, + getAppendix() { + if(this.state.contractAgreementList && this.state.contractAgreementList.length > 0) { + let appendix = this.state.contractAgreementList[0].appendix; + if (appendix && appendix.default) { + return ( +
+

{getLangText('Appendix')}

+
+                            {appendix.default}
+                        
+
+ ); + } + } + return null; + }, + getButtons() { if(this.props.loanHeading) { return ( @@ -257,6 +274,7 @@ let LoanForm = React.createClass({ required={this.props.showPassword ? 'required' : ''}/> {this.getContractCheckbox()} + {this.getAppendix()} {this.props.children} );