valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-07 09:28:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ask for notification permissions only on query execution

Browse Source
This commit is contained in:
Arik Fraimovich 2016-03-30 11:01:01 +03:00
parent ffe23fc59c
commit f5abb47d89
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rd_ui/app/scripts/controllers/controllers.js
View File

@ -150,7 +150,7 @@
});
}
var MainCtrl = function ($scope, $location, Dashboard, notifications) {
var MainCtrl = function ($scope, $location, Dashboard) {
$scope.$on("$routeChangeSuccess", function (event, current, previous, rejection) {
if ($scope.showPermissionError) {
$scope.showPermissionError = false;
@ -171,10 +171,6 @@
'name': null,
'layout': null
}
$(window).click(function () {
notifications.getPermissions();
});
};
var IndexCtrl = function ($scope, Events, Dashboard, Query) {
@ -188,6 +184,6 @@
angular.module('redash.controllers', [])
.controller('QueriesCtrl', ['$scope', '$http', '$location', '$filter', 'Query', QueriesCtrl])
.controller('IndexCtrl', ['$scope', 'Events', 'Dashboard', 'Query', IndexCtrl])
.controller('MainCtrl', ['$scope', '$location', 'Dashboard', 'notifications', MainCtrl])
.controller('MainCtrl', ['$scope', '$location', 'Dashboard', MainCtrl])
.controller('QuerySearchCtrl', ['$scope', '$location', '$filter', 'Events', 'Query', QuerySearchCtrl]);
})();

2
rd_ui/app/scripts/controllers/query_view.js
View File

@ -168,6 +168,8 @@
$scope.lockButton(true);
$scope.cancelling = false;
Events.record(currentUser, 'execute', 'query', $scope.query.id);
notifications.getPermissions();
};
$scope.cancelExecution = function() {