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
5fab1e89
Unverified
Commit
5fab1e89
authored
Mar 11, 2019
by
Torkel Ödegaard
Committed by
GitHub
Mar 11, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #15897 from grafana/revert-15608-fix-datasource-update
Revert "Fix Datasource Update to no User/Password"
parents
3f574d3e
f3753712
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
pkg/services/sqlstore/datasource.go
+6
-1
No files found.
pkg/services/sqlstore/datasource.go
View file @
5fab1e89
...
...
@@ -174,6 +174,11 @@ func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error {
Version
:
cmd
.
Version
+
1
,
}
sess
.
UseBool
(
"is_default"
)
sess
.
UseBool
(
"basic_auth"
)
sess
.
UseBool
(
"with_credentials"
)
sess
.
UseBool
(
"read_only"
)
var
updateSession
*
xorm
.
Session
if
cmd
.
Version
!=
0
{
// the reason we allow cmd.version > db.version is make it possible for people to force
...
...
@@ -185,7 +190,7 @@ func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error {
updateSession
=
sess
.
Where
(
"id=? and org_id=?"
,
ds
.
Id
,
ds
.
OrgId
)
}
affected
,
err
:=
updateSession
.
AllCols
()
.
Omit
(
"created"
)
.
Update
(
ds
)
affected
,
err
:=
updateSession
.
Update
(
ds
)
if
err
!=
nil
{
return
err
}
...
...
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