From 3fc6dcf4ca535974f72606c5bf2b2b8d3d6aca38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 11 Mar 2015 16:46:12 +0100 Subject: [PATCH] Bug#2402 Add resolveAbsolute method and used in csv export url building --- app/coffee/modules/admin/project-values.coffee | 2 +- app/coffee/modules/base/urls.coffee | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/coffee/modules/admin/project-values.coffee b/app/coffee/modules/admin/project-values.coffee index 09b23d58..0a1bcd99 100644 --- a/app/coffee/modules/admin/project-values.coffee +++ b/app/coffee/modules/admin/project-values.coffee @@ -640,7 +640,7 @@ class CsvExporterController extends taiga.Controller @rootscope.$on("project:loaded", @.setCsvUuid) @scope.$watch "csvUuid", (value) => if value - @scope.csvUrl = @urls.resolve("#{@.type}-csv", value) + @scope.csvUrl = @urls.resolveAbsolute("#{@.type}-csv", value) else @scope.csvUrl = "" diff --git a/app/coffee/modules/base/urls.coffee b/app/coffee/modules/base/urls.coffee index c542476a..46339b68 100644 --- a/app/coffee/modules/base/urls.coffee +++ b/app/coffee/modules/base/urls.coffee @@ -49,6 +49,14 @@ class UrlsService extends taiga.Service _.str.ltrim(url, "/") ]) + resolveAbsolute: -> + url = @.resolve.apply(@, arguments) + if (/^https?:\/\//i).test(url) + return url + if (/^\//).test(url) + return "#{window.location.protocol}//#{window.location.host}#{url}" + return "#{window.location.protocol}//#{window.location.host}/#{url}" + module = angular.module("taigaBase") module.service('$tgUrls', UrlsService)