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

Merge remote-tracking branch 'upstream/master'

Browse Source 
Conflicts:
	auto/gui.files.go
This commit is contained in:
Ryan Sullivan
2014-05-21 15:15:37 -04:00
parent b336b2c336 5b0dd9d3b2
commit 63c0f11458
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gui/app.js
View File

@@ -234,6 +234,9 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
};
$scope.nodeName = function (nodeCfg) {
if (typeof nodeCfg === 'undefined') {
return "";
}
if (nodeCfg.Name) {
return nodeCfg.Name;
}
@@ -314,7 +317,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
});
$scope.config.Nodes = $scope.nodes;
for (var id in repos) {
for (var id in $scope.repos) {
$scope.repos[id].Nodes = $scope.repos[id].Nodes.filter(function (n) {
return n.NodeID !== $scope.currentNode.NodeID;
});