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

Use userByReq from serverOptions

Browse Source
This commit is contained in:
Raul Ochoa
2015-01-20 18:12:24 +01:00
parent 62ffc05ef4
commit 007196555d
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/cartodb_windshaft.js
-5
View File
@@ -200,11 +200,6 @@ var CartodbWindshaft = function(serverOptions) {
);
});
// ---- Template maps interface starts @{
ws.userByReq = function(req) {
return serverOptions.userByReq(req);
};
var TemplateMapsController = require('./controllers/template_maps'),
templateMapsController = new TemplateMapsController(
lib/cartodb/controllers/template_maps.js
+6 -6
View File
@@ -30,7 +30,7 @@ TemplateMapsController.prototype.create = function(req, res) {
this.app.doCORS(res);
var cdbuser = self.app.userByReq(req);
var cdbuser = self.serverOptions.userByReq(req);
Step(
function checkPerms(){
@@ -77,7 +77,7 @@ TemplateMapsController.prototype.update = function(req, res) {
this.app.doCORS(res);
var cdbuser = this.app.userByReq(req);
var cdbuser = this.serverOptions.userByReq(req);
var template;
var tpl_id;
Step(
@@ -138,7 +138,7 @@ TemplateMapsController.prototype.retrieve = function(req, res) {
this.app.doCORS(res);
var cdbuser = this.app.userByReq(req);
var cdbuser = this.serverOptions.userByReq(req);
var template;
var tpl_id;
Step(
@@ -200,7 +200,7 @@ TemplateMapsController.prototype.destroy = function(req, res) {
}
this.app.doCORS(res);
var cdbuser = this.app.userByReq(req);
var cdbuser = this.serverOptions.userByReq(req);
var template;
var tpl_id;
Step(
@@ -254,7 +254,7 @@ TemplateMapsController.prototype.list = function(req, res) {
}
this.app.doCORS(res);
var cdbuser = this.app.userByReq(req);
var cdbuser = this.serverOptions.userByReq(req);
Step(
function checkPerms(){
@@ -354,7 +354,7 @@ TemplateMapsController.prototype.instantiateTemplate = function(req, res, templa
var template;
var layergroup;
var fakereq; // used for call to createLayergroup
var cdbuser = self.app.userByReq(req);
var cdbuser = self.serverOptions.userByReq(req);
// Format of template_id: [<template_owner>]@<template_id>
var tpl_id = req.params.template_id.split('@');
if ( tpl_id.length > 1 ) {