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
305a6ae1
Commit
305a6ae1
authored
Jun 17, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(dashboards): dashboard sharing fixes
parent
10daf1d6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
pkg/services/sqlstore/migrations/dashboard_mig.go
+4
-0
public/app/features/dashboard/import/dash_import.ts
+1
-3
No files found.
pkg/services/sqlstore/migrations/dashboard_mig.go
View file @
305a6ae1
...
@@ -107,4 +107,8 @@ func addDashboardMigration(mg *Migrator) {
...
@@ -107,4 +107,8 @@ func addDashboardMigration(mg *Migrator) {
mg
.
AddMigration
(
"Add column gnetId in dashboard"
,
NewAddColumnMigration
(
dashboardV2
,
&
Column
{
mg
.
AddMigration
(
"Add column gnetId in dashboard"
,
NewAddColumnMigration
(
dashboardV2
,
&
Column
{
Name
:
"gnet_id"
,
Type
:
DB_BigInt
,
Nullable
:
true
,
Name
:
"gnet_id"
,
Type
:
DB_BigInt
,
Nullable
:
true
,
}))
}))
mg
.
AddMigration
(
"Add index for gnetId in dashboard"
,
NewAddIndexMigration
(
dashboardV2
,
&
Index
{
Cols
:
[]
string
{
"gnet_id"
},
Type
:
IndexType
,
}))
}
}
public/app/features/dashboard/import/dash_import.ts
View file @
305a6ae1
...
@@ -69,9 +69,7 @@ export class DashImportCtrl {
...
@@ -69,9 +69,7 @@ export class DashImportCtrl {
if
(
sources
.
length
===
0
)
{
if
(
sources
.
length
===
0
)
{
inputModel
.
info
=
"No data sources of type "
+
input
.
pluginName
+
" found"
;
inputModel
.
info
=
"No data sources of type "
+
input
.
pluginName
+
" found"
;
}
else
if
(
inputModel
.
description
)
{
}
else
if
(
!
inputModel
.
info
)
{
inputModel
.
info
=
inputModel
.
description
;
}
else
{
inputModel
.
info
=
"Select a "
+
input
.
pluginName
+
" data source"
;
inputModel
.
info
=
"Select a "
+
input
.
pluginName
+
" data source"
;
}
}
...
...
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