cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get analyses results from res.locals

Browse Source
This commit is contained in:
Daniel García Aubert
2017-10-31 16:01:18 +01:00
parent a4b2044e10
commit 5f7d5f6ec8
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/controllers/map.js
+3 -6
View File
@@ -189,15 +189,12 @@ MapController.prototype.create = function(req, res, prepareConfigFn, next) {
function finish(err) {
if (err) {
err = Number.isFinite(err.layerIndex) ? populateError(err, mapConfig) : err;
err.label = 'ANONYMOUS LAYERGROUP';
return next(err);
}
const { layergroup } = res.locals;
const { layergroup, analysesResults = [] } = res.locals;
var analysesResults = context.analysesResults || [];
self.addDataviewsAndWidgetsUrls(res.locals.user, layergroup, mapConfig.obj());
self.addAnalysesMetadata(res.locals.user, layergroup, analysesResults, true);
addContextMetadata(layergroup, mapConfig.obj(), context);
@@ -295,13 +292,13 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
return next(err);
}
const { layergroup } = res.locals;
const { layergroup, analysesResults = [] } = res.locals;
var templateHash = self.templateMaps.fingerPrint(mapConfigProvider.template).substring(0, 8);
layergroup.layergroupid = cdbuser + '@' + templateHash + '@' + layergroup.layergroupid;
self.addDataviewsAndWidgetsUrls(cdbuser, layergroup, mapConfig.obj());
self.addAnalysesMetadata(cdbuser, layergroup, mapConfigProvider.analysesResults);
self.addAnalysesMetadata(cdbuser, layergroup, analysesResults);
addContextMetadata(layergroup, mapConfig.obj(), mapConfigProvider.context);
res.set('X-Layergroup-Id', layergroup.layergroupid);