From fab87e21688ddce977d5584d8d99eace6a75afde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 31 Oct 2017 15:47:59 +0100 Subject: [PATCH] Get layergroup from locals. It's not provided by previous middleware anymore --- lib/cartodb/controllers/map.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js index b2663299..0c860f05 100644 --- a/lib/cartodb/controllers/map.js +++ b/lib/cartodb/controllers/map.js @@ -186,7 +186,7 @@ MapController.prototype.create = function(req, res, prepareConfigFn, next) { self.afterLayergroupCreate(req, res, this); }, - function finish(err, layergroup) { + function finish(err) { if (err) { err = Number.isFinite(err.layerIndex) ? populateError(err, mapConfig) : err; @@ -195,6 +195,8 @@ MapController.prototype.create = function(req, res, prepareConfigFn, next) { return next(err); } + const { layergroup } = res.locals; + var analysesResults = context.analysesResults || []; self.addDataviewsAndWidgetsUrls(res.locals.user, layergroup, mapConfig.obj()); self.addAnalysesMetadata(res.locals.user, layergroup, analysesResults, true); @@ -287,11 +289,13 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn self.afterLayergroupCreate(req, res, this); }, - function finishTemplateInstantiation(err, layergroup) { + function finishTemplateInstantiation(err) { if (err) { err.label = 'NAMED MAP LAYERGROUP'; next(err); } else { + const { layergroup } = res.locals; + var templateHash = self.templateMaps.fingerPrint(mapConfigProvider.template).substring(0, 8); layergroup.layergroupid = cdbuser + '@' + templateHash + '@' + layergroup.layergroupid;