Skip to content

T
Tia-dev
Commit 4ee2da01 authored by Faisal Hamdi's avatar Faisal Hamdi
Browse files
Options

Merge branch 'faisal' into 'master' 

refresh

See merge request !948
parents 69f25b30 a5d06133
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ 4ee2da01
...@@ -201,7 +201,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -201,7 +201,7 @@ export default class FixedAssetsMovementMR extends Component {
} }
}) })
console.log(dataTable); console.log(dataTable);
this.setState({ dataTable, loading: false }) this.setState({ dataTable, loading: false, refresh: false })
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
if (response.data.message.includes("Someone Logged In")) { if (response.data.message.includes("Someone Logged In")) {
...@@ -213,7 +213,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -213,7 +213,7 @@ export default class FixedAssetsMovementMR extends Component {
}) })
} }
} else { } else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false }) this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false, refresh: false })
} }
}) })
} }
...@@ -1314,7 +1314,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1314,7 +1314,7 @@ export default class FixedAssetsMovementMR extends Component {
</div> </div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}> <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
{!this.state.loading && ( {!this.state.refresh && (
<MuiThemeProvider theme={getMuiTheme()}> <MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable <MUIDataTable
data={dataTable2} data={dataTable2}
...@@ -1362,7 +1362,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1362,7 +1362,7 @@ export default class FixedAssetsMovementMR extends Component {
outline: 'none' outline: 'none'
}} }}
onClick={() => { onClick={() => {
this.setState({loading: true}, () => { this.setState({loading: true, refresh: true}, () => {
this.handleGetFor('edit') this.handleGetFor('edit')
}) })
}} }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment