From: Laurence Maultsby Date: Tue, 16 May 2017 17:10:27 +0000 (-0400) Subject: Merge branch 'v2.0' X-Git-Tag: v3.0.0rc~16 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=commitdiff_plain;h=7d4f9d996741de733e168ff9e1a07770fdbac82a;hp=9a4c35c99529d07696b140c4e35e06d9aac2cfe3 Merge branch 'v2.0' Signed-off-by: Laurence Maultsby --- diff --git a/skyquake/plugins/accounts/src/account/accountsDashboard.jsx b/skyquake/plugins/accounts/src/account/accountsDashboard.jsx index f139b474b..7b5601182 100644 --- a/skyquake/plugins/accounts/src/account/accountsDashboard.jsx +++ b/skyquake/plugins/accounts/src/account/accountsDashboard.jsx @@ -26,7 +26,7 @@ import 'style/layout.scss'; class AccountsDashboard extends React.Component { constructor(props) { super(props); - this.Store = this.props.flux.stores.hasOwnProperty('AccountStore') ? this.props.flux.stores.AccountStore : this.props.flux.createStore(AccountStore); + this.Store = this.props.flux.stores.hasOwnProperty('AccountStore') ? this.props.flux.stores.AccountStore : this.props.flux.createStore(AccountStore, "AccountStore"); this.state = this.Store.getState(); } componentWillMount() { diff --git a/skyquake/plugins/config/src/dashboard/dashboard.jsx b/skyquake/plugins/config/src/dashboard/dashboard.jsx index 99bff0681..743099498 100644 --- a/skyquake/plugins/config/src/dashboard/dashboard.jsx +++ b/skyquake/plugins/config/src/dashboard/dashboard.jsx @@ -15,7 +15,7 @@ import Button from 'widgets/button/rw.button.js'; class ConfigDashboard extends React.Component { constructor(props) { super(props); - this.Store = this.props.flux.stores.hasOwnProperty('ConfigStore') ? this.props.flux.stores.ConfigStore : this.props.flux.createStore(ConfigStore); + this.Store = this.props.flux.stores.hasOwnProperty('ConfigStore') ? this.props.flux.stores.ConfigStore : this.props.flux.createStore(ConfigStore, "ConfigStore"); this.state = this.Store.getState(); } componentWillMount() {