diff --git a/src/views/activity.html b/src/views/activity.html
index 23685bdbb..b2fbb5f21 100644
--- a/src/views/activity.html
+++ b/src/views/activity.html
@@ -17,6 +17,7 @@
diff --git a/src/views/activity.js b/src/views/activity.js
index 6425625e6..7155615ef 100644
--- a/src/views/activity.js
+++ b/src/views/activity.js
@@ -9,6 +9,7 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
$scope.config = Client.getConfig();
$scope.busy = false;
+ $scope.busyRefresh = false;
$scope.eventLogs = [];
$scope.activeEventLog = null;
@@ -408,22 +409,36 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca
return line;
}
- function fetchEventLogs() {
- $scope.busy = true;
+ function fetchEventLogs(background, callback) {
+ callback = callback || function (error) { if (error) console.error(error); };
+ background = background || false;
+
+ if (!background) $scope.busy = true;
+
var actions = $scope.selectedActions.map(function (a) { return a.value; }).join(', ');
Client.getEventLogs(actions, $scope.search || null, $scope.currentPage, $scope.pageItems.value, function (error, result) {
$scope.busy = false;
- if (error) return console.error(error);
+ if (error) return callback(error);
$scope.eventLogs = [];
result.forEach(function (e) {
$scope.eventLogs.push({ raw: e, details: eventLogDetails(e), source: eventLogSource(e) });
});
+
+ callback();
});
}
+ $scope.refresh = function () {
+ $scope.busyRefresh = true;
+
+ fetchEventLogs(true, function () {
+ $scope.busyRefresh = false;
+ });
+ };
+
$scope.showNextPage = function () {
$scope.currentPage++;
fetchEventLogs();