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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
auto/gui.files.go
View File

File diff suppressed because one or more lines are too long

8
cmd/syncthing/gui.go
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) { 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) { func restGetCompletion(m *model.Model, w http.ResponseWriter, r *http.Request) {

2
gui/app.js
View File

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