Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow loading of panels and dashboards from subfolders #674

Merged
merged 1 commit into from
Nov 7, 2013
Merged

allow loading of panels and dashboards from subfolders #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/controllers/dash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/directives/addPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 3 additions & 2 deletions src/app/directives/kibanaPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -88,7 +89,7 @@ function (angular) {
if ($controllers.length) {
$controllers.first().prepend(editorTemplate);
$scope.require([
'panels/'+name+'/module'
'panels/'+nameAsPath+'/module'
], function() {
loadModule($module);
});
Expand Down
6 changes: 3 additions & 3 deletions src/app/directives/kibanaSimplePanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -46,7 +46,7 @@ function (angular, _) {
if ($controllers.length) {
$controllers.first().prepend(panelLoading);
$scope.require([
'panels/'+name+'/module'
'panels/'+nameAsPath+'/module'
], function() {
loadModule($module);
});
Expand Down
4 changes: 2 additions & 2 deletions src/app/services/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down