Commit 01683395 authored by Shani's avatar Shani

Merge branch 'release-5.8.8' into 'master'

Release 5.8.8

See merge request !939
parents 40ce8245 f738a833
......@@ -5,7 +5,7 @@ var globalSetting = {
// serverUrl : "http://10.162.20.247", // Shani
serverUrl: "http://billrun",
//serverUrl: "",
serverApiVersion: '5.8.7',
serverApiVersion: '5.8.8',
serverApiTimeOut: 300000, // 5 minutes
serverApiDebug: false,
serverApiDebugQueryString: 'XDEBUG_SESSION_START=netbeans-xdebug',
......
var globalSetting = {
storageVersion: '0.0.1',
serverUrl: "",
serverApiVersion: '5.8.7',
serverApiVersion: '5.8.8',
serverApiTimeOut: 300000, // 5 minutes
serverApiDebug: false,
serverApiDebugQueryString: 'XDEBUG_SESSION_START=netbeans-xdebug',
......
......@@ -20,9 +20,11 @@ export default class GatewayParamsModal extends Component {
componentWillReceiveProps(nextProps) {
const { gateway, settings } = nextProps;
const currentConnection = gateway.getIn(['receiver', 'connections', 0]) === undefined ? {} :
gateway.getIn(['receiver', 'connections', 0]).toJS();
if (gateway) return this.setState({ connection: currentConnection, gateway: gateway.toJS()});
if (gateway) {
const currentConnection = gateway.getIn(['receiver', 'connections', 0]) === undefined ? {} :
gateway.getIn(['receiver', 'connections', 0]).toJS();
return this.setState({ connection: currentConnection, gateway: gateway.toJS()});
}
return this.setState({gateway: {name: settings.get('name'), params: {}}});
}
......
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