mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Fix an issue preventing loading dashboards from subfolders.
This commit is contained in:
parent
22040c7dd1
commit
2e7a2d7410
@ -274,7 +274,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
|
||||
|
||||
this.file_load = function(file) {
|
||||
return $http({
|
||||
url: "app/dashboards/"+file.replace(".(?!json)","/")+'?' + new Date().getTime(),
|
||||
url: "app/dashboards/"+file.replace(/\.(?!json)/,"/")+'?' + new Date().getTime(),
|
||||
method: "GET",
|
||||
transformResponse: function(response) {
|
||||
return renderTemplate(response,$routeParams);
|
||||
@ -314,7 +314,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
|
||||
|
||||
this.script_load = function(file) {
|
||||
return $http({
|
||||
url: "app/dashboards/"+file.replace(".(?!js)","/"),
|
||||
url: "app/dashboards/"+file.replace(/\.(?!js)/,"/"),
|
||||
method: "GET",
|
||||
transformResponse: function(response) {
|
||||
/*jshint -W054 */
|
||||
|
Loading…
Reference in New Issue
Block a user