Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
05738258
Commit
05738258
authored
Jan 24, 2019
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed dashboard import issue after move
parent
e713b0f0
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
4 deletions
+5
-4
public/app/features/manage-dashboards/DashboardImportCtrl.ts
+2
-0
public/app/features/manage-dashboards/index.ts
+0
-2
public/app/routes/routes.ts
+3
-2
No files found.
public/app/features/manage-dashboards/DashboardImportCtrl.ts
View file @
05738258
...
@@ -232,3 +232,5 @@ export class DashboardImportCtrl {
...
@@ -232,3 +232,5 @@ export class DashboardImportCtrl {
this
.
gnetInfo
=
''
;
this
.
gnetInfo
=
''
;
}
}
}
}
export
default
DashboardImportCtrl
;
public/app/features/manage-dashboards/index.ts
View file @
05738258
...
@@ -8,10 +8,8 @@ export * from './components/UploadDashboard';
...
@@ -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
);
public/app/routes/routes.ts
View file @
05738258
...
@@ -12,6 +12,7 @@ import FolderSettingsPage from 'app/features/folders/FolderSettingsPage';
...
@@ -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) {
...
@@ -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'
,
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment