Commit d512d8ee authored by Patricio Bruna's avatar Patricio Bruna Committed by Juorder Antonio

Merge by Juorder

parents e568cb5f 94a5892c
...@@ -24,7 +24,6 @@ import DistributionLists from './components/distribution/distribution_lists.jsx' ...@@ -24,7 +24,6 @@ import DistributionLists from './components/distribution/distribution_lists.jsx'
import EditDistributionList from './components/distribution/edit_distribution_lists.jsx'; import EditDistributionList from './components/distribution/edit_distribution_lists.jsx';
import SearchView from './components/search/search.jsx'; import SearchView from './components/search/search.jsx';
import SalesForm from './components/sales/sales.jsx'; import SalesForm from './components/sales/sales.jsx';
import * as Client from './utils/client.jsx'; import * as Client from './utils/client.jsx';
import * as Utils from './utils/utils.jsx'; import * as Utils from './utils/utils.jsx';
import Constants from './utils/constants.jsx'; import Constants from './utils/constants.jsx';
...@@ -46,14 +45,15 @@ const notFoundParams = { ...@@ -46,14 +45,15 @@ const notFoundParams = {
function preRenderSetup(callwhendone) { function preRenderSetup(callwhendone) {
const d1 = Client.getClientConfig( const d1 = Client.getClientConfig(
(data) => { (data) => {
const config = data.result || data;
if (!data) { if (!config) {
return; return;
} }
global.window.manager_config = data; global.window.manager_config = config;
if (data.debug) { if (config.debug) {
global.window.Client = Client; global.window.Client = Client;
global.window.Utils = Utils; global.window.Utils = Utils;
} }
......
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