perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gui: Fix setting page size on failed and locally changed modals (fixes #5421) (#5650)

Browse Source
This commit is contained in:
Simon Frei
2019-04-13 14:05:39 +02:00
committed by Jakob Borg
parent fca895a632
commit 8a4b65b937
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/default/syncthing/core/syncthingController.js
View File

@@ -329,7 +329,7 @@ angular.module('syncthing.core')
});
$scope.$on(Events.FOLDER_ERRORS, function (event, arg) {
$scope.model[arg.data.folder].pullErrors = arg.data.errors.length;
$scope.model[arg.data.folder].errors = arg.data.errors.length;
});
$scope.$on(Events.FOLDER_SCAN_PROGRESS, function (event, arg) {
@@ -653,7 +653,7 @@ angular.module('syncthing.core')
};
$scope.refreshFailed = function (page, perpage) {
var url = urlbase + '/folder/pullerrors?folder=' + encodeURIComponent($scope.failed.folder);
var url = urlbase + '/folder/errors?folder=' + encodeURIComponent($scope.failed.folder);
url += "&page=" + page + "&perpage=" + perpage;
$http.get(url).success(function (data) {
$scope.failed = data;
@@ -676,7 +676,7 @@ angular.module('syncthing.core')
$scope.refreshLocalChanged = function (page, perpage) {
var url = urlbase + '/db/localchanged?folder=';
url += encodeURIComponent($scope.localChanged.folder);
url += encodeURIComponent($scope.localChangedFolder);
url += "&page=" + page + "&perpage=" + perpage;
$http.get(url).success(function (data) {
$scope.localChanged = data;
@@ -2193,7 +2193,7 @@ angular.module('syncthing.core')
if (!$scope.model[folder]) {
return false;
}
return $scope.model[folder].pullErrors !== 0;
return $scope.model[folder].errors !== 0;
};
$scope.override = function (folder) {
@@ -2201,7 +2201,7 @@ angular.module('syncthing.core')
};
$scope.showLocalChanged = function (folder) {
$scope.localChanged.folder = folder;
$scope.localChangedFolder = folder;
$scope.localChanged = $scope.refreshLocalChanged(1, 10);
$('#localChanged').modal().one('hidden.bs.modal', function () {
$scope.localChanged = {};