IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-02 12:17:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Unsaved changes: Do not show for users with role , Fixes #1703

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-04-02 08:08:22 +02:00
parent 00fa7f5e86
commit 3b737999d6
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,6 +1,7 @@
# 2.0.0-RC1 (unreleased) # 2.0.0-RC1 (unreleased)
**FIxes** **FIxes**
- [Issue #1703](https://github.com/grafana/grafana/issues/1703). Unsaved changes: Do not show for users with role `Viewer`
- [Issue #1675](https://github.com/grafana/grafana/issues/1675). Data source proxy: Fixed issue with Gzip enabled and data source proxy - [Issue #1675](https://github.com/grafana/grafana/issues/1675). Data source proxy: Fixed issue with Gzip enabled and data source proxy
- [Issue #1681](https://github.com/grafana/grafana/issues/1681). MySQL session: fixed problem using mysql as session store - [Issue #1681](https://github.com/grafana/grafana/issues/1681). MySQL session: fixed problem using mysql as session store
- [Issue #1671](https://github.com/grafana/grafana/issues/1671). Data sources: Fixed issue with changing default data source (should not require full page load to take effect, now fixed) - [Issue #1671](https://github.com/grafana/grafana/issues/1671). Data sources: Fixed issue with changing default data source (should not require full page load to take effect, now fixed)

12
public/app/features/dashboard/unsavedChangesSrv.js
View File

@ -12,7 +12,7 @@ function(angular, _, config) {
var module = angular.module('grafana.services'); var module = angular.module('grafana.services');
module.service('unsavedChangesSrv', function($rootScope, $modal, $q, $location, $timeout) { module.service('unsavedChangesSrv', function($rootScope, $modal, $q, $location, $timeout, contextSrv) {
var self = this; var self = this;
var modalScope = $rootScope.$new(); var modalScope = $rootScope.$new();
@ -36,7 +36,11 @@ function(angular, _, config) {
self.originalPath = $location.path(); self.originalPath = $location.path();
}); });
this.ignoreChangeCheck = function() {
};
window.onbeforeunload = function() { window.onbeforeunload = function() {
if (contextSrv.hasRole('Viewer')) { return true; }
if (self.has_unsaved_changes()) { if (self.has_unsaved_changes()) {
return "There are unsaved changes to this dashboard"; return "There are unsaved changes to this dashboard";
} }
@ -44,9 +48,9 @@ function(angular, _, config) {
this.init = function() { this.init = function() {
$rootScope.$on("$locationChangeStart", function(event, next) { $rootScope.$on("$locationChangeStart", function(event, next) {
if (self.originalPath === $location.path()) { // check if we should look for changes
return; if (self.originalPath === $location.path()) { return true; }
} if (contextSrv.hasRole('Viewer')) { return true; }
if (self.has_unsaved_changes()) { if (self.has_unsaved_changes()) {
event.preventDefault(); event.preventDefault();

4
public/views/index.html
View File

@ -16,10 +16,6 @@
<link rel="icon" type="image/png" href="[[.AppSubUrl]]/img/fav32.png"> <link rel="icon" type="image/png" href="[[.AppSubUrl]]/img/fav32.png">
<base href="[[.AppSubUrl]]/" /> <base href="[[.AppSubUrl]]/" />
<script type="text/javascript">
window.grafanaBackend = true;
</script>
<!-- build:js [[.AppSubUrl]]/app/app.js --> <!-- build:js [[.AppSubUrl]]/app/app.js -->
<script src="[[.AppSubUrl]]/public/vendor/require/require.js"></script> <script src="[[.AppSubUrl]]/public/vendor/require/require.js"></script>
<script src="[[.AppSubUrl]]/public/app/components/require.config.js"></script> <script src="[[.AppSubUrl]]/public/app/components/require.config.js"></script>