/rest/version should return JSON (fixes #694)

This commit is contained in:
Jakob Borg 2014-09-18 12:52:45 +02:00
parent 37a473e7d6
commit d7956dd495
3 changed files with 9 additions and 3 deletions

File diff suppressed because one or more lines are too long

View File

@ -200,7 +200,13 @@ func withModel(m *model.Model, h func(m *model.Model, w http.ResponseWriter, r *
}
func restGetVersion(w http.ResponseWriter, r *http.Request) {
w.Write([]byte(Version))
w.Header().Set("Content-Type", "application/json; charset=utf-8")
json.NewEncoder(w).Encode(map[string]string{
"version": Version,
"longVersion": LongVersion,
"os": runtime.GOOS,
"arch": runtime.GOARCH,
})
}
func restGetCompletion(m *model.Model, w http.ResponseWriter, r *http.Request) {

View File

@ -390,7 +390,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
refreshNodeStats();
$http.get(urlbase + '/version').success(function (data) {
$scope.version = data;
$scope.version = data.version;
});
$http.get(urlbase + '/report').success(function (data) {