jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2026-05-09 03:03:08 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1368 from getredash/rand

Browse Source 
Change: added ability to disable auto update in admin views
This commit is contained in:
Arik Fraimovich
2016-10-27 19:32:16 +03:00
committed by GitHub
parent aa5d14ed02 d2c64c6da2
commit 002f794f2a
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rd_ui/app/scripts/controllers/admin_controllers.js
View File

@@ -43,6 +43,7 @@
var AdminTasksCtrl = function ($scope, $location, Events, $http, $timeout, $filter) {
Events.record(currentUser, "view", "page", "admin/tasks");
$scope.$parent.pageTitle = "Running Queries";
$scope.autoUpdate = true;
$scope.gridConfig = {
isPaginationEnabled: true,
@@ -121,11 +122,13 @@
$scope.setTab($location.hash() || 'in_progress');
var refresh = function () {
$scope.refresh_time = moment().add(1, 'minutes');
$http.get('/api/admin/queries/tasks').success(function (data) {
$scope.tasks = data;
$scope.showingTasks = $scope.tasks[$scope.selectedTab];
});
if ($scope.autoUpdate) {
$scope.refresh_time = moment().add(1, 'minutes');
$http.get('/api/admin/queries/tasks').success(function (data) {
$scope.tasks = data;
$scope.showingTasks = $scope.tasks[$scope.selectedTab];
});
}
var timer = $timeout(refresh, 5 * 1000);
@@ -142,6 +145,7 @@
var AdminOutdatedQueriesCtrl = function ($scope, Events, $http, $timeout, $filter) {
Events.record(currentUser, "view", "page", "admin/outdated_queries");
$scope.$parent.pageTitle = "Outdated Queries";
$scope.autoUpdate = true;
$scope.gridConfig = {
isPaginationEnabled: true,
@@ -190,13 +194,16 @@
];
var refresh = function () {
$scope.refresh_time = moment().add(1, 'minutes');
$http.get('/api/admin/queries/outdated').success(function (data) {
$scope.queries = data.queries;
$scope.updatedAt = data.updated_at * 1000.0;
});
if ($scope.autoUpdate) {
$scope.refresh_time = moment().add(1, 'minutes');
$http.get('/api/admin/queries/outdated').success(function (data) {
$scope.queries = data.queries;
$scope.updatedAt = data.updated_at * 1000.0;
});
}
var timer = $timeout(refresh, 59 * 1000);
// var timer = $timeout(refresh, 59 * 1000);
var timer = $timeout(refresh, 10 * 1000);
$scope.$on("$destroy", function () {
if (timer) {

1
rd_ui/app/views/admin/outdated_queries.html
View File

@@ -15,5 +15,6 @@
<div class="badge">
Last update: <span am-time-ago="updatedAt"></span>
</div>
(<label><input type="checkbox" ng-model="autoUpdate"> Auto Update</label>)
</div>
</div>

2
rd_ui/app/views/admin/tasks.html
View File

@@ -18,6 +18,8 @@
<smart-table rows="showingTasks" columns="gridColumns"
config="gridConfig"
class="table table-condensed table-hover"></smart-table>
<label><input type="checkbox" ng-model="autoUpdate"> Auto Update</label>
</div>
</div>

2
rd_ui/app/views/admin_status.html
View File

@@ -39,7 +39,7 @@
<li class="list-group-item active">Queues</li>
<li class="list-group-item" ng-repeat="(name, value) in manager.queues">
<span class="badge">{{value.size}}</span>
{{name}} ({{value.data_sources}})
{{name}} <span popover="{{value.data_sources}}" popover-trigger="mouseenter"><i class="fa fa-question-circle"></i></span>
</li>
</ul>
</div>