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 snapshot sharing issue

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-03-27 06:47:58 +01:00
parent 7be7aeb70a
commit d3db49ae3e
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/dashboard_snapshot.go
View File

@ -15,7 +15,7 @@ import (
func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapshotCommand) { func CreateDashboardSnapshot(c *middleware.Context, cmd m.CreateDashboardSnapshotCommand) {
if cmd.External { if cmd.External {
// external snapshot ref requires key and delete key // external snapshot ref requires key and delete key
if cmd.Key != "" && cmd.DeleteKey != "" { if cmd.Key == "" || cmd.DeleteKey == "" {
c.JsonApiErr(400, "Missing key and delete key for external snapshot", nil) c.JsonApiErr(400, "Missing key and delete key for external snapshot", nil)
return return
} }

2
src/app/features/dashboard/shareSnapshotCtrl.js
View File

@ -102,7 +102,7 @@ function (angular, _) {
// save external in local instance as well // save external in local instance as well
cmdData.external = true; cmdData.external = true;
cmdData.key = results.key; cmdData.key = results.key;
cmdData.delete_key = results.delete_key; cmdData.deleteKey = results.deleteKey;
backendSrv.post('/api/snapshots/', cmdData); backendSrv.post('/api/snapshots/', cmdData);
}; };

6
src/app/services/backendSrv.js
View File

@ -54,12 +54,16 @@ function (angular, _, config) {
this.request = function(options) { this.request = function(options) {
var httpOptions = { var httpOptions = {
url: config.appSubUrl + options.url, url: options.url,
method: options.method, method: options.method,
data: options.data, data: options.data,
params: options.params, params: options.params,
}; };
if (httpOptions.url.indexOf('/') === 0) {
httpOptions.url = config.appSubUrl + httpOptions.url;
}
return $http(httpOptions).then(function(results) { return $http(httpOptions).then(function(results) {
if (options.method !== 'GET') { if (options.method !== 'GET') {
if (results && results.data.message) { if (results && results.data.message) {