Get layergroup from locals. It's not provided by previous middleware anymore

This commit is contained in:
Daniel García Aubert
2017-10-31 15:47:59 +01:00
parent 34e219353c
commit fab87e2168
+6 -2
View File
@@ -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;