Commit 2e7a2d74 by Boaz Leskes

Fix an issue preventing loading dashboards from subfolders.

parent 22040c7d
...@@ -274,7 +274,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) { ...@@ -274,7 +274,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
this.file_load = function(file) { this.file_load = function(file) {
return $http({ return $http({
url: "app/dashboards/"+file.replace(".(?!json)","/")+'?' + new Date().getTime(), url: "app/dashboards/"+file.replace(/\.(?!json)/,"/")+'?' + new Date().getTime(),
method: "GET", method: "GET",
transformResponse: function(response) { transformResponse: function(response) {
return renderTemplate(response,$routeParams); return renderTemplate(response,$routeParams);
...@@ -314,7 +314,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) { ...@@ -314,7 +314,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
this.script_load = function(file) { this.script_load = function(file) {
return $http({ return $http({
url: "app/dashboards/"+file.replace(".(?!js)","/"), url: "app/dashboards/"+file.replace(/\.(?!js)/,"/"),
method: "GET", method: "GET",
transformResponse: function(response) { transformResponse: function(response) {
/*jshint -W054 */ /*jshint -W054 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment