IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed dashboard import issue after move

Browse Source
This commit is contained in:
Torkel Ödegaard
2019-01-24 09:46:03 +01:00
parent e713b0f029
commit 05738258bb
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/features/manage-dashboards/DashboardImportCtrl.ts
View File

@@ -232,3 +232,5 @@ export class DashboardImportCtrl {
this.gnetInfo = ''; this.gnetInfo = '';
} }
} }
export default DashboardImportCtrl;

2
public/app/features/manage-dashboards/index.ts
View File

@@ -8,10 +8,8 @@ export * from './components/UploadDashboard';
// Controllers // Controllers
import { DashboardListCtrl } from './DashboardListCtrl'; import { DashboardListCtrl } from './DashboardListCtrl';
import { SnapshotListCtrl } from './SnapshotListCtrl'; import { SnapshotListCtrl } from './SnapshotListCtrl';
import { DashboardImportCtrl } from './DashboardImportCtrl';
import coreModule from 'app/core/core_module'; import coreModule from 'app/core/core_module';
coreModule.controller('DashboardListCtrl', DashboardListCtrl); coreModule.controller('DashboardListCtrl', DashboardListCtrl);
coreModule.controller('SnapshotListCtrl', SnapshotListCtrl); coreModule.controller('SnapshotListCtrl', SnapshotListCtrl);
coreModule.controller('DashboardImportCtrl', DashboardImportCtrl);

5
public/app/routes/routes.ts
View File

@@ -12,6 +12,7 @@ import FolderSettingsPage from 'app/features/folders/FolderSettingsPage';
import FolderPermissions from 'app/features/folders/FolderPermissions'; import FolderPermissions from 'app/features/folders/FolderPermissions';
import CreateFolderCtrl from 'app/features/folders/CreateFolderCtrl'; import CreateFolderCtrl from 'app/features/folders/CreateFolderCtrl';
import FolderDashboardsCtrl from 'app/features/folders/FolderDashboardsCtrl'; import FolderDashboardsCtrl from 'app/features/folders/FolderDashboardsCtrl';
import DashboardImportCtrl from 'app/features/manage-dashboards/DashboardImportCtrl';
import DataSourcesListPage from 'app/features/datasources/DataSourcesListPage'; import DataSourcesListPage from 'app/features/datasources/DataSourcesListPage';
import NewDataSourcePage from '../features/datasources/NewDataSourcePage'; import NewDataSourcePage from '../features/datasources/NewDataSourcePage';
import UsersListPage from 'app/features/users/UsersListPage'; import UsersListPage from 'app/features/users/UsersListPage';
@@ -68,8 +69,8 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
pageClass: 'page-dashboard', pageClass: 'page-dashboard',
}) })
.when('/dashboard/import', { .when('/dashboard/import', {
templateUrl: 'public/app/features/dashboard/partials/dashboard_import.html', templateUrl: 'public/app/features/manage-dashboards/partials/dashboard_import.html',
controller: 'DashboardImportCtrl', controller: DashboardImportCtrl,
controllerAs: 'ctrl', controllerAs: 'ctrl',
}) })
.when('/datasources', { .when('/datasources', {