From c4268ddfc8c3d7ec43f117c4e9ea5e5c80b0e0d1 Mon Sep 17 00:00:00 2001
From: Aaron Lindsay <aaron@aclindsay.com>
Date: Sat, 10 Jun 2017 13:37:13 -0400
Subject: [PATCH] Clean up some more problems after switching to using classes

---
 js/actions/ImportActions.js      |  4 ++--
 js/components/AccountRegister.js |  4 +++-
 js/components/NewUserModal.js    | 21 ++++++++++++---------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/js/actions/ImportActions.js b/js/actions/ImportActions.js
index 7c2b6dd..3ece1e6 100644
--- a/js/actions/ImportActions.js
+++ b/js/actions/ImportActions.js
@@ -145,12 +145,12 @@ function importFile(url, inputElement) {
 }
 
 function importOFXFile(inputElement, account) {
-	url = "account/"+account.AccountId+"/import/ofxfile";
+	var url = "account/"+account.AccountId+"/import/ofxfile";
 	return importFile(url, inputElement);
 }
 
 function importGnucash(inputElement) {
-	url = "import/gnucash";
+	var url = "import/gnucash";
 	return importFile(url, inputElement);
 }
 
diff --git a/js/components/AccountRegister.js b/js/components/AccountRegister.js
index 5a92c66..0b04457 100644
--- a/js/components/AccountRegister.js
+++ b/js/components/AccountRegister.js
@@ -781,7 +781,9 @@ class AccountRegister extends React.Component {
 	handleImportComplete() {
 		this.props.onCloseImportModal();
 		this.props.onFetchAllAccounts();
-		this.props.onFetchTransactionPage(this.props.accounts[this.props.selectedAccount], this.props.pageSize, this.props.transactionPage.page);
+		if (this.props.selectedAccount != -1) {
+			this.props.onFetchTransactionPage(this.props.accounts[this.props.selectedAccount], this.props.pageSize, this.props.transactionPage.page);
+		}
 	}
 	handleDeleteTransaction(transaction) {
 		this.props.onDeleteTransaction(transaction);
diff --git a/js/components/NewUserModal.js b/js/components/NewUserModal.js
index 62791a6..dc8587b 100644
--- a/js/components/NewUserModal.js
+++ b/js/components/NewUserModal.js
@@ -27,6 +27,9 @@ class NewUserModal extends React.Component {
 			passwordChanged: false,
 			initial_password: ""
 		};
+		this.onCancel = this.handleCancel.bind(this);
+		this.onChange = this.handleChange.bind(this);
+		this.onSubmit = this.handleSubmit.bind(this);
 	}
 	passwordValidationState() {
 		if (this.state.passwordChanged) {
@@ -81,19 +84,19 @@ class NewUserModal extends React.Component {
 	}
 	render() {
 		return (
-			<Modal show={this.props.show} onHide={this.handleCancel} bsSize="large">
+			<Modal show={this.props.show} onHide={this.onCancel} bsSize="large">
 				<Modal.Header closeButton>
 					<Modal.Title>Create New user</Modal.Title>
 				</Modal.Header>
 				<Modal.Body>
 				<span style={{color: "red"}}>{this.state.error}</span>
-				<Form horizontal onSubmit={this.handleSubmit}>
+				<Form horizontal onSubmit={this.onSubmit}>
 					<FormGroup>
 						<Col componentClass={ControlLabel} xs={2}>Name</Col>
 						<Col xs={10}>
 						<FormControl type="text"
 							value={this.state.name}
-							onChange={this.handleChange}
+							onChange={this.onChange}
 							ref="name"/>
 						</Col>
 					</FormGroup>
@@ -102,7 +105,7 @@ class NewUserModal extends React.Component {
 						<Col xs={10}>
 						<FormControl type="text"
 							value={this.state.username}
-							onChange={this.handleChange}
+							onChange={this.onChange}
 							ref="username"/>
 						</Col>
 					</FormGroup>
@@ -111,7 +114,7 @@ class NewUserModal extends React.Component {
 						<Col xs={10}>
 						<FormControl type="email"
 							value={this.state.email}
-							onChange={this.handleChange}
+							onChange={this.onChange}
 							ref="email"/>
 						</Col>
 					</FormGroup>
@@ -120,7 +123,7 @@ class NewUserModal extends React.Component {
 						<Col xs={10}>
 						<FormControl type="password"
 							value={this.state.password}
-							onChange={this.handleChange}
+							onChange={this.onChange}
 							ref="password"/>
 						<FormControl.Feedback/>
 						</Col>
@@ -130,7 +133,7 @@ class NewUserModal extends React.Component {
 						<Col xs={10}>
 						<FormControl type="password"
 							value={this.state.confirm_password}
-							onChange={this.handleChange}
+							onChange={this.onChange}
 							ref="confirm_password"/>
 						<FormControl.Feedback/>
 						</Col>
@@ -139,9 +142,9 @@ class NewUserModal extends React.Component {
 				</Modal.Body>
 				<Modal.Footer>
 					<ButtonGroup>
-						<Button onClick={this.handleCancel}
+						<Button onClick={this.onCancel}
 								bsStyle="warning">Cancel</Button>
-						<Button onClick={this.handleSubmit}
+						<Button onClick={this.onSubmit}
 								bsStyle="success">Create New User</Button>
 					</ButtonGroup>
 				</Modal.Footer>