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

SharePanel: fix to share feature, Closes #1035

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-11-10 16:18:59 +01:00
parent f9c3cdab67
commit a301c96c9d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/controllers/sharePanelCtrl.js
View File

@ -66,11 +66,13 @@ function (angular, _) {
var paramsArray = []; var paramsArray = [];
_.each(params, function(value, key) { _.each(params, function(value, key) {
var str = key; if (value === null) { return; }
if (value !== true) { if (value === true) {
str += '=' + encodeURIComponent(value); paramsArray.push(key);
} else {
key += '=' + encodeURIComponent(value);
paramsArray.push(key);
} }
paramsArray.push(str);
}); });
$scope.shareUrl = baseUrl + "?" + paramsArray.join('&') ; $scope.shareUrl = baseUrl + "?" + paramsArray.join('&') ;

6
src/app/services/dashboard/dashboardViewStateSrv.js
View File

@ -51,9 +51,8 @@ function (angular, _, $) {
DashboardViewState.prototype.getQueryStringState = function() { DashboardViewState.prototype.getQueryStringState = function() {
var state = $location.search(); var state = $location.search();
state.panelId = parseInt(state.panelId) || null; state.panelId = parseInt(state.panelId) || null;
state.fullscreen = state.fullscreen ? true : false; state.fullscreen = state.fullscreen ? true : null;
state.edit = state.edit ? true : false; state.edit = (state.edit === "true" || state.edit === true) || null;
return state; return state;
}; };
@ -61,7 +60,6 @@ function (angular, _, $) {
var urlState = _.clone(this.state); var urlState = _.clone(this.state);
urlState.fullscreen = this.state.fullscreen ? true : null, urlState.fullscreen = this.state.fullscreen ? true : null,
urlState.edit = this.state.edit ? true : null; urlState.edit = this.state.edit ? true : null;
return urlState; return urlState;
}; };