IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 09:05:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

allow loading of panels and dashboards from subfolders

Browse Source 
every . in their name is mapped to a /
This commit is contained in:
Boaz Leskes 2013-11-07 22:00:48 +01:00
parent 2b9a8a00f9
commit d3495ff739
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/controllers/dash.js
View File

@ -70,7 +70,7 @@ function (angular, config, _) {
$scope.edit_path = function(type) {
if(type) {
return 'app/panels/'+type+'/editor.html';
return 'app/panels/'+type.replace(".","/")+'/editor.html';
} else {
return false;
}

2
src/app/directives/addPanel.js
View File

@ -17,7 +17,7 @@ function (angular, app, _) {
$scope.reset_panel(_type);
if(!_.isUndefined($scope.panel.type)) {
$scope.panel.loadingEditor = true;
$scope.require(['panels/'+$scope.panel.type+'/module'], function () {
$scope.require(['panels/'+$scope.panel.type.replace(".","/") +'/module'], function () {
var template = '<div ng-controller="'+$scope.panel.type+'" ng-include="\'app/partials/paneladd.html\'"></div>';
elem.html($compile(angular.element(template))($scope));
$scope.panel.loadingEditor = false;

5
src/app/directives/kibanaPanel.js
View File

@ -75,9 +75,10 @@ function (angular) {
$scope.$watch(attr.type, function (name) {
elem.addClass("ng-cloak");
// load the panels module file, then render it in the dom.
var nameAsPath = name.replace(".", "/");
$scope.require([
'jquery',
'text!panels/'+name+'/module.html'
'text!panels/'+nameAsPath+'/module.html'
], function ($, moduleTemplate) {
var $module = $(moduleTemplate);
// top level controllers
@ -88,7 +89,7 @@ function (angular) {
if ($controllers.length) {
$controllers.first().prepend(editorTemplate);
$scope.require([
'panels/'+name+'/module'
'panels/'+nameAsPath+'/module'
], function() {
loadModule($module);
});

6
src/app/directives/kibanaSimplePanel.js
View File

@ -32,10 +32,10 @@ function (angular, _) {
function loadController(name) {
elem.addClass("ng-cloak");
// load the panels module file, then render it in the dom.
var nameAsPath = name.replace(".", "/");
$scope.require([
'jquery',
'text!panels/'+name+'/module.html'
'text!panels/'+nameAsPath+'/module.html'
], function ($, moduleTemplate) {
var $module = $(moduleTemplate);
// top level controllers
@ -46,7 +46,7 @@ function (angular, _) {
if ($controllers.length) {
$controllers.first().prepend(panelLoading);
$scope.require([
'panels/'+name+'/module'
'panels/'+nameAsPath+'/module'
], function() {
loadModule($module);
});

4
src/app/services/dashboard.js
View File

@ -274,7 +274,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
this.file_load = function(file) {
return $http({
url: "app/dashboards/"+file+'?' + new Date().getTime(),
url: "app/dashboards/"+file.replace(".","/")+'?' + 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,
url: "app/dashboards/"+file.replace(".","/"),
method: "GET",
transformResponse: function(response) {
/*jshint -W054 */