GUI version string includes OS and Arch

(Useful when debugging via screenshots...)
This commit is contained in:
Jakob Borg 2015-04-09 11:32:54 +02:00
parent e41e58e781
commit 4b07609458
2 changed files with 27 additions and 2 deletions

View File

@ -326,7 +326,7 @@
</tr>
<tr>
<th><span class="glyphicon glyphicon-tag"></span>&emsp;<span translate>Version</span></th>
<td class="text-right">{{version}}</td>
<td class="text-right">{{versionString()}}</td>
</tr>
</tbody>
</table>

View File

@ -40,6 +40,7 @@ angular.module('syncthing.core')
$scope.deviceStats = {};
$scope.folderStats = {};
$scope.progress = {};
$scope.version = {};
$(window).bind('beforeunload', function () {
navigatingAway = true;
@ -76,7 +77,7 @@ angular.module('syncthing.core')
refreshFolderStats();
$http.get(urlbase + '/system/version').success(function (data) {
$scope.version = data.version;
$scope.version = data;
}).error($scope.emitHTTPError);
$http.get(urlbase + '/svc/report').success(function (data) {
@ -1204,6 +1205,30 @@ angular.module('syncthing.core')
}).error($scope.emitHTTPError);
};
$scope.versionString = function () {
if (!$scope.version.version) {
return '';
}
var os = {
'darwin': 'Mac OS X',
'dragonfly': 'DragonFly BSD',
'freebsd': 'FreeBSD',
'openbsd': 'OpenBSD',
'netbsd': 'NetBSD',
'linux': 'Linux',
'windows': 'Windows',
'solaris': 'Solaris',
}[$scope.version.os];
var arch ={
'386': '32 bit',
'amd64': '64 bit',
}[$scope.version.arch];
return $scope.version.version + ', ' + os + ' (' + arch + ')';
};
// pseudo main. called on all definitions assigned
initController();
});